Bläddra i källkod

webgl还有华佗能打包的版本, 之后需要把华佗卸载了

hexiaojie 9 månader sedan
förälder
incheckning
fffaa1f09e
100 ändrade filer med 1712 tillägg och 2516 borttagningar
  1. BIN
      GameClient/.idea/.idea.GameClient/.idea/copilot/chatSessions/00000000000.xd
  2. BIN
      GameClient/.idea/.idea.GameClient/.idea/copilot/chatSessions/blobs/version
  3. 0 78
      GameClient/.idea/.idea.GameClient/.idea/copilot/chatSessions/xd.lck
  4. 6 0
      GameClient/.idea/.idea.GameClient/.idea/inspectionProfiles/Project_Default.xml
  5. 0 800
      GameClient/Assets/Demo/Demo.cs
  6. 3 3
      GameClient/Assets/Editor/Bat/commitGame.bat
  7. 2 1
      GameClient/Assets/Game/HotUpdate/Assets/PrefabManager.cs
  8. 0 12
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  9. 1 1
      GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs
  10. 0 4
      GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs
  11. 2 11
      GameClient/Assets/Game/HotUpdate/Data/ShopViewManager.cs
  12. 1 1
      GameClient/Assets/Game/HotUpdate/ETCodes/ETManager.cs
  13. 7 7
      GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Login/LoginHelper.cs
  14. 1 1
      GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Scene/SceneFactory.cs
  15. 4 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs
  16. 58 58
      GameClient/Assets/Game/HotUpdate/Platform/AliPay/AliManager.cs
  17. 265 265
      GameClient/Assets/Game/HotUpdate/Platform/QDDouYouManager.cs
  18. 3 252
      GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs
  19. 0 3
      GameClient/Assets/Game/HotUpdate/Platform/ShareSDK.meta
  20. 0 124
      GameClient/Assets/Game/HotUpdate/Platform/ShareSDK/QDShareManager.cs
  21. 0 3
      GameClient/Assets/Game/HotUpdate/Platform/ShareSDK/QDShareManager.cs.meta
  22. 1 1
      GameClient/Assets/Game/HotUpdate/ServerProxy/AccountSProxy.cs
  23. 0 1
      GameClient/Assets/Game/HotUpdate/ServerProxy/CommonSProxy.cs
  24. 0 1
      GameClient/Assets/Game/HotUpdate/ServerProxy/RoleInfoSProxy.cs
  25. 3 3
      GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs
  26. 0 5
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs
  27. 0 6
      GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs
  28. 6 6
      GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxWishView.cs
  29. 0 22
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  30. 0 24
      GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs
  31. 1 26
      GameClient/Assets/Game/HotUpdate/Views/Share/ShareView.cs
  32. 3 3
      GameClient/Assets/Game/HotUpdate/Views/Store/StorePayPropView.cs
  33. 9 62
      GameClient/Assets/Game/Launcher/HotUpdateProxy/HotUpdateCodeLoader.cs
  34. 2 11
      GameClient/Assets/Game/Launcher/LauncherConfig.cs
  35. 18 4
      GameClient/Assets/Game/Launcher/LauncherController.cs
  36. 48 48
      GameClient/Assets/Game/Launcher/Platform/ATTAuth.cs
  37. 43 43
      GameClient/Assets/Game/Launcher/Platform/IDouYouSDKListener.cs
  38. 97 97
      GameClient/Assets/Game/Launcher/Platform/Pay/AliPayManagerInit.cs
  39. 9 9
      GameClient/Assets/Game/Launcher/Platform/Pay/IAliSDKListener.cs
  40. 46 46
      GameClient/Assets/Game/Launcher/Platform/QDAppStoreManagerInit.cs
  41. 301 301
      GameClient/Assets/Game/Launcher/Platform/QDDouYouManagerInit.cs
  42. 1 15
      GameClient/Assets/Game/Launcher/Platform/QDManagerInit.cs
  43. 0 3
      GameClient/Assets/Game/Launcher/Platform/ShareSDK.meta
  44. 0 24
      GameClient/Assets/Game/Launcher/Platform/ShareSDK/IShareSDKListener.cs
  45. 0 3
      GameClient/Assets/Game/Launcher/Platform/ShareSDK/IShareSDKListener.cs.meta
  46. 0 77
      GameClient/Assets/Game/Launcher/Platform/ShareSDK/QDShareManagerInit.cs
  47. 0 3
      GameClient/Assets/Game/Launcher/Platform/ShareSDK/QDShareManagerInit.cs.meta
  48. 39 20
      GameClient/Assets/Game/Launcher/Version/VersionController.cs
  49. 21 2
      GameClient/Assets/Game/Launcher/Views/HealthAdviceView.cs
  50. 58 15
      GameClient/Assets/Game/Launcher/Views/LauncherView.cs
  51. 28 6
      GameClient/Assets/Game/Launcher/Views/PadMaskView.cs
  52. 1 1
      GameClient/Assets/Plugins/HybridCLR.meta
  53. 12 0
      GameClient/Assets/ResIn/Fight/bg_fhl.png.meta
  54. 12 0
      GameClient/Assets/ResIn/Fight/fightBg.png.meta
  55. 12 0
      GameClient/Assets/ResIn/Fight/jingzhongh_bg.png.meta
  56. 12 0
      GameClient/Assets/ResIn/Fight/zd_bj_bja_1.png.meta
  57. 12 0
      GameClient/Assets/ResIn/Fight/zd_bj_bja_2.png.meta
  58. 12 0
      GameClient/Assets/ResIn/Fight/zd_bj_qg_1 1.png.meta
  59. 12 0
      GameClient/Assets/ResIn/Fight/zd_bj_qgqg_1.png.meta
  60. 12 0
      GameClient/Assets/ResIn/Fight/zd_bj_qgqg_2.png.meta
  61. 12 0
      GameClient/Assets/ResIn/Fight/zd_drpf_dzuo.png.meta
  62. 12 0
      GameClient/Assets/ResIn/Fight/zd_jsjm_bjtu.png.meta
  63. 12 0
      GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_02.png.meta
  64. 12 0
      GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_t.png.meta
  65. 12 0
      GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_top.png.meta
  66. 12 0
      GameClient/Assets/ResIn/UI/Activity/Activity_atlas0!a.png.meta
  67. 12 0
      GameClient/Assets/ResIn/UI/Activity/Activity_atlas0.png.meta
  68. 12 0
      GameClient/Assets/ResIn/UI/Activity/Activity_atlas0_1!a.png.meta
  69. 12 0
      GameClient/Assets/ResIn/UI/Activity/Activity_atlas0_1.png.meta
  70. 12 0
      GameClient/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0!a.png.meta
  71. 12 0
      GameClient/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0.png.meta
  72. 12 0
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0!a.png.meta
  73. 12 0
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0.png.meta
  74. 12 0
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1!a.png.meta
  75. 12 0
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1.png.meta
  76. 24 0
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2!a.png.meta
  77. 24 0
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2.png.meta
  78. 24 0
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3!a.png.meta
  79. 24 0
      GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3.png.meta
  80. 12 0
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png.meta
  81. 12 0
      GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0.png.meta
  82. 12 0
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0!a.png.meta
  83. 12 0
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0.png.meta
  84. 12 0
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1!a.png.meta
  85. 12 0
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1.png.meta
  86. 24 0
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_2!a.png.meta
  87. 24 0
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_2.png.meta
  88. 12 0
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0!a.png.meta
  89. 12 0
      GameClient/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0.png.meta
  90. 12 0
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0!a.png.meta
  91. 12 0
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0.png.meta
  92. 12 0
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1!a.png.meta
  93. 12 0
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1.png.meta
  94. 12 0
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2!a.png.meta
  95. 12 0
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2.png.meta
  96. 12 0
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3!a.png.meta
  97. 12 0
      GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3.png.meta
  98. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png
  99. 12 0
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png.meta
  100. BIN
      GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png

BIN
GameClient/.idea/.idea.GameClient/.idea/copilot/chatSessions/00000000000.xd


BIN
GameClient/.idea/.idea.GameClient/.idea/copilot/chatSessions/blobs/version


+ 0 - 78
GameClient/.idea/.idea.GameClient/.idea/copilot/chatSessions/xd.lck

@@ -1,78 +0,0 @@
-Private property of Exodus: 32556@DESKTOP-8ILLQSI
-
-jetbrains.exodus.io.LockingManager.lock(LockingManager.kt:88)
-jetbrains.exodus.io.LockingManager.lock(LockingManager.kt:39)
-jetbrains.exodus.io.FileDataWriter.lock(FileDataWriter.kt:70)
-jetbrains.exodus.log.Log.tryLock(Log.kt:804)
-jetbrains.exodus.log.Log.<init>(Log.kt:117)
-jetbrains.exodus.env.Environments.newLogInstance(Environments.kt:117)
-jetbrains.exodus.env.Environments.newLogInstance(Environments.kt:81)
-jetbrains.exodus.env.Environments.newLogInstance(Environments.kt:77)
-jetbrains.exodus.env.Environments$newInstance$4.invoke(Environments.kt:46)
-jetbrains.exodus.env.Environments$newInstance$4.invoke(Environments.kt:46)
-jetbrains.exodus.env.Environments.prepare(Environments.kt:120)
-jetbrains.exodus.env.Environments.newInstance(Environments.kt:46)
-kotlinx.dnq.store.container.EntityStoreHelperKt.createTransientEntityStore(EntityStoreHelper.kt:40)
-kotlinx.dnq.store.container.EntityStoreHelperKt.createTransientEntityStore(EntityStoreHelper.kt:31)
-kotlinx.dnq.store.container.EntityStoreHelperKt.createTransientEntityStore$default(EntityStoreHelper.kt:30)
-com.github.copilot.chat.session.persistence.xodus.XdChatSessionPersistenceService.initStore(XdChatSessionPersistenceService.kt:115)
-com.github.copilot.chat.session.persistence.xodus.XdChatSessionPersistenceService.<init>(XdChatSessionPersistenceService.kt:22)
-com.github.copilot.chat.session.persistence.xodus.XdChatSessionPersistenceService.<init>(XdChatSessionPersistenceService.kt:15)
-com.github.copilot.chat.session.persistence.ChatSessionPersistenceServiceKt.ChatSessionPersistenceService(ChatSessionPersistenceService.kt:43)
-com.github.copilot.chat.session.persistence.ChatSessionPersistenceServiceKt.chatSessionsPersistenceService(ChatSessionPersistenceService.kt:53)
-com.github.copilot.chat.session.ChatSessionManager.<init>(ChatSessionManager.kt:45)
-com.github.copilot.chat.session.ChatSessionManager.<init>(ChatSessionManager.kt:25)
-com.github.copilot.chat.window.CopilotChatToolWindow.onCopilotReady(CopilotChatToolWindow.kt:133)
-com.github.copilot.chat.window.CopilotChatToolWindow.access$onCopilotReady(CopilotChatToolWindow.kt:40)
-com.github.copilot.chat.window.CopilotChatToolWindow$initCopilotStatusListener$1.invoke(CopilotChatToolWindow.kt:118)
-com.github.copilot.chat.window.CopilotChatToolWindow$initCopilotStatusListener$1.invoke(CopilotChatToolWindow.kt:115)
-com.github.copilot.status.CopilotAuthStatusKt.subscribeToCopilotAuthStatus(CopilotAuthStatus.kt:27)
-com.github.copilot.chat.window.CopilotChatToolWindow.initCopilotStatusListener(CopilotChatToolWindow.kt:115)
-com.github.copilot.chat.window.CopilotChatToolWindow.<init>(CopilotChatToolWindow.kt:59)
-com.github.copilot.chat.window.CopilotChatToolWindow.<init>(CopilotChatToolWindow.kt:40)
-com.github.copilot.chat.window.CopilotChatToolWindowFactory.init(CopilotChatToolWindowFactory.kt:18)
-com.intellij.openapi.wm.impl.ToolWindowManagerImpl.registerToolWindow$intellij_platform_ide_impl(ToolWindowManagerImpl.kt:1083)
-com.intellij.toolWindow.ToolWindowSetInitializerKt.registerToolWindows(ToolWindowSetInitializer.kt:181)
-com.intellij.toolWindow.ToolWindowSetInitializerKt.access$registerToolWindows(ToolWindowSetInitializer.kt:1)
-com.intellij.toolWindow.ToolWindowSetInitializer$createAndLayoutToolWindows$entries$1$1.invoke(ToolWindowSetInitializer.kt:129)
-com.intellij.toolWindow.ToolWindowSetInitializer$createAndLayoutToolWindows$entries$1$1.invoke(ToolWindowSetInitializer.kt:121)
-com.intellij.openapi.progress.CoroutinesKt.blockingContext(coroutines.kt:248)
-com.intellij.openapi.progress.CoroutinesKt.blockingContext(coroutines.kt:199)
-com.intellij.toolWindow.ToolWindowSetInitializer$createAndLayoutToolWindows$entries$1.invokeSuspend(ToolWindowSetInitializer.kt:121)
-kotlin.coroutines.jvm.internal.BaseContinuationImpl.resumeWith(ContinuationImpl.kt:33)
-kotlinx.coroutines.DispatchedTask.run(DispatchedTask.kt:106)
-com.intellij.openapi.application.TransactionGuardImpl$1.run(TransactionGuardImpl.java:193)
-com.intellij.openapi.application.impl.ApplicationImpl.runIntendedWriteActionOnCurrentThread(ApplicationImpl.java:861)
-com.intellij.openapi.application.impl.ApplicationImpl$4.run(ApplicationImpl.java:478)
-com.intellij.openapi.application.impl.FlushQueue.doRun(FlushQueue.java:79)
-com.intellij.openapi.application.impl.FlushQueue.runNextEvent(FlushQueue.java:121)
-com.intellij.openapi.application.impl.FlushQueue.flushNow(FlushQueue.java:41)
-java.desktop/java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:318)
-java.desktop/java.awt.EventQueue.dispatchEventImpl(EventQueue.java:789)
-java.desktop/java.awt.EventQueue$3.run(EventQueue.java:740)
-java.desktop/java.awt.EventQueue$3.run(EventQueue.java:734)
-java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
-java.base/java.security.ProtectionDomain$JavaSecurityAccessImpl.doIntersectionPrivilege(ProtectionDomain.java:86)
-java.desktop/java.awt.EventQueue.dispatchEvent(EventQueue.java:759)
-com.intellij.ide.IdeEventQueue.defaultDispatchEvent(IdeEventQueue.kt:685)
-com.intellij.ide.IdeEventQueue._dispatchEvent$lambda$10(IdeEventQueue.kt:589)
-com.intellij.openapi.application.impl.ApplicationImpl.runWithoutImplicitRead(ApplicationImpl.java:1485)
-com.intellij.ide.IdeEventQueue._dispatchEvent(IdeEventQueue.kt:589)
-com.intellij.ide.IdeEventQueue.access$_dispatchEvent(IdeEventQueue.kt:67)
-com.intellij.ide.IdeEventQueue$dispatchEvent$processEventRunnable$1$1$1.compute(IdeEventQueue.kt:369)
-com.intellij.ide.IdeEventQueue$dispatchEvent$processEventRunnable$1$1$1.compute(IdeEventQueue.kt:368)
-com.intellij.openapi.progress.impl.CoreProgressManager.computePrioritized(CoreProgressManager.java:787)
-com.intellij.ide.IdeEventQueue$dispatchEvent$processEventRunnable$1$1.invoke(IdeEventQueue.kt:368)
-com.intellij.ide.IdeEventQueue$dispatchEvent$processEventRunnable$1$1.invoke(IdeEventQueue.kt:363)
-com.intellij.ide.IdeEventQueueKt.performActivity$lambda$1(IdeEventQueue.kt:992)
-com.intellij.openapi.application.TransactionGuardImpl.performActivity(TransactionGuardImpl.java:105)
-com.intellij.ide.IdeEventQueueKt.performActivity(IdeEventQueue.kt:992)
-com.intellij.ide.IdeEventQueue.dispatchEvent$lambda$7(IdeEventQueue.kt:363)
-com.intellij.openapi.application.impl.ApplicationImpl.runIntendedWriteActionOnCurrentThread(ApplicationImpl.java:861)
-com.intellij.ide.IdeEventQueue.dispatchEvent(IdeEventQueue.kt:405)
-java.desktop/java.awt.EventDispatchThread.pumpOneEventForFilters(EventDispatchThread.java:207)
-java.desktop/java.awt.EventDispatchThread.pumpEventsForFilter(EventDispatchThread.java:128)
-java.desktop/java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:117)
-java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:113)
-java.desktop/java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:105)
-java.desktop/java.awt.EventDispatchThread.run(EventDispatchThread.java:92)

+ 6 - 0
GameClient/.idea/.idea.GameClient/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="JSSuspiciousNameCombination" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>

+ 0 - 800
GameClient/Assets/Demo/Demo.cs

@@ -1,800 +0,0 @@
-using UnityEngine;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using cn.sharesdk.unity3d;
-using LitJson;
-public class Demo : MonoBehaviour {
-
-	public GUISkin demoSkin;
-	public ShareSDK ssdk;
-	
-	public MobSDK mobsdk;
-	
-	// Use this for initialization
-	void Start ()
-	{	
-		ssdk = gameObject.GetComponent<ShareSDK>();
-		ssdk.authHandler = OnAuthResultHandler;
-		ssdk.shareHandler = OnShareResultHandler;
-		ssdk.showUserHandler = OnGetUserInfoResultHandler;
-		ssdk.getFriendsHandler = OnGetFriendsResultHandler;
-		ssdk.followFriendHandler = OnFollowFriendResultHandler;
-		ssdk.clientValidForAndroidHandler = onIsClientValidForAndroid;
-
-		mobsdk = gameObject.GetComponent<MobSDK>();
-        #if UNITY_ANDROID
-		//ShareSDKRestoreScene.setRestoreSceneListener(OnRestoreScene);
-		
-        #elif UNITY_IPHONE
-		mobsdk.getPolicy = OnFollowGetPolicy;
-        ssdk.wxRequestHandler = GetWXRequestTokenResultHandler;
-        //ShareSDKRestoreScene.setRestoreSceneListener(OnRestoreScene);
-        #endif
-
-    }
-
-	// Update is called once per frame
-	void Update () 
-	{
-		if (Input.GetKeyDown(KeyCode.Escape)) {
-			Application.Quit();
-		}
-	}
-	
-	void OnGUI ()
-	{
-
-		GUI.skin = demoSkin;
-		
-		float scale = 1.0f;
-
-		if (Application.platform == RuntimePlatform.IPhonePlayer)
-		{
-			scale = Screen.width / 320;
-		}
-		
-		//float btnWidth = 165 * scale;
-		float btnWidth= Screen.width / 5 * 2;
-        float btnWidth2 = btnWidth + 80 * scale;
-
-        float btnHeight = Screen.height / 25;
-		float btnTop = 30 * scale;
-		float btnGap = 20 * scale;
-		GUI.skin.button.fontSize = Convert.ToInt32(13 * scale);
-
-		if (GUI.Button(new Rect((Screen.width - btnGap) / 2 - btnWidth, btnTop, btnWidth, btnHeight), "Authorize"))
-		{
-			print(ssdk == null);
-
-#if UNITY_ANDROID
-		    ssdk.Authorize(PlatformType.SinaWeibo);
-#elif UNITY_IPHONE
-            ssdk.Authorize(PlatformType.Twitter);
-#endif
-		}
-
-		if (GUI.Button(new Rect((Screen.width - btnGap) / 2 + btnGap, btnTop, btnWidth, btnHeight), "Get User Info"))
-		{
-            //ssdk.GetUserInfo(PlatformType.Douyin);
-
-            //print("share result :" + ssdk.GetUserInfo(PlatformType.WeChat));
-			print("share result :" + ssdk.Authorize(PlatformType.WeChat));
-			
-			
-			//print("share result : " + ssdk.GetUserInfo(PlatformType.GooglePlus));
-        }
-
-		btnTop += btnHeight + 20 * scale;
-		if (GUI.Button(new Rect((Screen.width - btnGap) / 2 - btnWidth, btnTop, btnWidth, btnHeight), "Show Share Menu"))
-		{
-            	ShareContent content = new ShareContent();
-
-            //	//(Android only) 隐藏九宫格里面不需要用到的平台(仅仅是不显示平台)
-            //	//(Android only) 也可以把jar包删除或者把Enabl属性e改成false(对应平台的全部功能将用不了)
-                String[] platfsList = {((int)PlatformType.Facebook).ToString(), ((int)PlatformType.TencentWeibo).ToString()};
-            	content.SetHidePlatforms (platfsList);
-
-            	content.SetText("this is a test string.");
-				content.SetImageUrl("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
-				content.SetUrl("https://www.mob.com");
-            	content.SetTitle("test title");
-				content.SetDouyin_shareActionMode(1);
-
-            //(Android only) 针对Android绕过审核的多图分享,传图片String数组 
-            //String[] imageArray =  {"/sdcard/test.jpg", "http://f1.webshare.mob.com/dimgs/1c950a7b02087bf41bc56f07f7d3572c11dfcf36.jpg", "/sdcard/test.jpg"};
-            //content.SetImageArray (imageArray);
-
-            //content.SetTitleUrl("https://www.baidu.com/");
-            //content.SetSite("Test site params test test");
-            //content.SetSiteUrl("https://www.baidu.com/");
-            //content.SetUrl("https://www.baidu.com/");
-            //content.SetComment("test description");
-            //content.SetMusicUrl("http://i.y.qq.com/v8/playsong.html?hostuin=0&songid=&songmid=002x5Jje3eUkXT&_wv=1&source=qq&appshare=iphone&media_mid=002x5Jje3eUkXT");
-
-            content.SetShareType(ContentType.Image);
-
-			//不同平台分享不同内容
-			//ShareContent customizeShareParams = new ShareContent();
-			//customizeShareParams.SetText("Sina share content");
-			//customizeShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
-			//customizeShareParams.SetShareType(ContentType.Text);
-			//customizeShareParams.SetObjectID("SinaID");
-			//content.SetShareContentCustomize(PlatformType.SinaWeibo, customizeShareParams);
-
-			//KakaoTalk原生只支持分享链接
-			ShareContent kakaoTalkCustomizeShareParams = new ShareContent();
-			kakaoTalkCustomizeShareParams.SetUrl("http://www.mob.com");
-			kakaoTalkCustomizeShareParams.SetShareType(ContentType.Webpage);
-			kakaoTalkCustomizeShareParams.SetTemplateId("11820");
-			content.SetShareContentCustomize(PlatformType.KakaoTalk, kakaoTalkCustomizeShareParams);
-
-			//KakaoStory分享图片
-			ShareContent kakaoStoryCustomizeShareParams = new ShareContent();
-			kakaoStoryCustomizeShareParams.SetText("");
-			kakaoStoryCustomizeShareParams.SetTitle("http://www.mob.com");
-			kakaoStoryCustomizeShareParams.SetImageUrl("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
-			kakaoStoryCustomizeShareParams.SetUrl("");
-			kakaoStoryCustomizeShareParams.SetPermission("0");
-			kakaoStoryCustomizeShareParams.SetEnableShare(true);
-
-			Hashtable androidExecParams = new Hashtable();
-			androidExecParams["andParam1"] = "value1";
-			androidExecParams["andParam2"] = "value2";
-			kakaoStoryCustomizeShareParams.SetAndroidExecParam(androidExecParams);
-
-			Hashtable iOSExecParams = new Hashtable();
-			iOSExecParams["iosParam1"] = "value1";
-			iOSExecParams["iosParam2"] = "value2";
-			kakaoStoryCustomizeShareParams.SetIphoneExecParam(iOSExecParams);
-
-			kakaoStoryCustomizeShareParams.SetShareType(ContentType.Image);
-			content.SetShareContentCustomize(PlatformType.KakaoStory, kakaoStoryCustomizeShareParams);
-
-			//TikTok分享多图
-			String[] imageArray = { "http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg", "http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg" };
-			ShareContent tiktokCustomizeShareParams = new ShareContent();
-			tiktokCustomizeShareParams.SetImageArray(imageArray);
-			tiktokCustomizeShareParams.SetShareType(ContentType.Image);
-			content.SetShareContentCustomize(PlatformType.TikTok, tiktokCustomizeShareParams);
-			
-#if UNITY_IPHONE
-			//SnapChat分享图片
-			ShareContent snapChatShareParams = new ShareContent();
-			snapChatShareParams.SetTitle("https://www.mobtech.com");
-			snapChatShareParams.SetImageUrl("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
-			snapChatShareParams.setSnapStickerImage("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
-			snapChatShareParams.setSnapStickerAnimated(0);
-			snapChatShareParams.setSnapStickerRotation(0);
-			snapChatShareParams.SetShareType(ContentType.Image);
-			content.SetShareContentCustomize(PlatformType.SnapChat, snapChatShareParams);
-            //快手SDK-分享私信
-            ShareContent ksShareParams = new ShareContent();
-            ksShareParams.SetTitle("title");
-            ksShareParams.SetDesc("desc");
-            ksShareParams.SetLinkURL("https://www.mob.com");
-            ksShareParams.SetThumbImageUrl("http://download.sdk.mob.com/web/images/2019/07/30/14/1564468183056/750_750_65.12.png");
-            ksShareParams.SetExtraInfo("message");
-            ksShareParams.SetShareType(ContentType.Message);
-			content.SetShareContentCustomize(PlatformType.KuaiShou, ksShareParams);
-#endif
-
-			//抖音-分享系统视频
-			//ShareContent dyShareParams = new ShareContent();
-			//dyShareParams.SetAssetLocalIdsArray();  //此处应传入从相册取得的图片或者视频文件的Assetlocalidentifier集合
-			//dyShareParams.SetDouyinHashtag("hastag");
-			//Hashtable extraInfo = new Hashtable();
-			//extraInfo["iosParam1"] = "value1";
-			//extraInfo["iosParam2"] = "value2";
-			//dyShareParams.SetDouyin_extraInfo(extraInfo);
-			//dyShareParams.SetShareType(ContentType.Video);
-			//content.SetShareContentCustomize(PlatformType.Douyin, dyShareParams);
-
-			//Facebook分享图片
-			ShareContent fbShareParams = new ShareContent();
-			fbShareParams.SetText("text");
-			fbShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
-			fbShareParams.setFacebookShareType(FacebookShareType.Native);
-			fbShareParams.SetShareType(ContentType.Image);
-			content.SetShareContentCustomize(PlatformType.Facebook, fbShareParams);
-
-			//FacebookMessenger分享图片
-			ShareContent messShareParams = new ShareContent();
-			messShareParams.SetTitle("title");
-			messShareParams.SetUrl("http://www.mob.com");
-			messShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
-			messShareParams.SetShareType(ContentType.Image);
-			content.SetShareContentCustomize(PlatformType.FacebookMessenger, messShareParams);
-
-			//Instagram分享图片
-			ShareContent insShareParams = new ShareContent();
-			insShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
-			insShareParams.SetMenuX(0);
-			insShareParams.SetMenuY(0);
-			content.SetShareContentCustomize(PlatformType.Instagram, insShareParams);
-
-			//LinkedIn分享链接
-			ShareContent linkedInShareParams = new ShareContent();
-			linkedInShareParams.SetTitle("title");
-			linkedInShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
-			linkedInShareParams.SetUrl("http://www.mob.com");
-			linkedInShareParams.SetTitle("title");
-			linkedInShareParams.SetDesc("desc");
-			linkedInShareParams.SetShareType(ContentType.Webpage);
-			content.SetShareContentCustomize(PlatformType.LinkedIn, linkedInShareParams);
-
-
-			//Instapaper分享链接
-			ShareContent instapapaerShareParams = new ShareContent();
-			instapapaerShareParams.SetTitle("title");
-			instapapaerShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
-			instapapaerShareParams.SetUrl("http://www.mob.com");
-			instapapaerShareParams.SetTitle("title");
-			instapapaerShareParams.SetShareType(ContentType.Webpage);
-			content.SetShareContentCustomize(PlatformType.Instapaper, instapapaerShareParams);
-
-			//Pocket分享链接
-			ShareContent pocketShareParams = new ShareContent();
-			pocketShareParams.SetTitle("title");
-			pocketShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
-			pocketShareParams.SetUrl("http://www.mob.com");
-			pocketShareParams.SetTitle("title");
-			pocketShareParams.SetShareType(ContentType.Webpage);
-			content.SetShareContentCustomize(PlatformType.Pocket, pocketShareParams);
-
-			//有道分享图片
-			ShareContent youdaoShareParams = new ShareContent();
-			youdaoShareParams.SetText("text");
-			youdaoShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
-			youdaoShareParams.SetTitle("title");
-			youdaoShareParams.SetSource("MOB");
-			youdaoShareParams.SetAuthor("mob");
-			content.SetShareContentCustomize(PlatformType.YouDaoNote, youdaoShareParams);
-
-#if UNITY_IPHONE
-			//Dropbox分享图片
-			ShareContent dropboxShareParams = new ShareContent();
-			//dropboxShareParams.SetAttachmentPath("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
-			var files = System.IO.Directory.GetFiles(Application.dataPath, "cat.mp4", System.IO.SearchOption.AllDirectories);
-			string filePath = files[0];
-			dropboxShareParams.SetAttachmentPath(filePath);
-			content.SetShareContentCustomize(PlatformType.Dropbox, dropboxShareParams);
-#endif
-			//明道分享链接
-			ShareContent mingdaoShareParams = new ShareContent();
-			mingdaoShareParams.SetTitle("title");
-			mingdaoShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
-			mingdaoShareParams.SetUrl("http://www.mob.com");
-			mingdaoShareParams.SetTitle("title");
-			mingdaoShareParams.SetShareType(ContentType.Webpage);
-			content.SetShareContentCustomize(PlatformType.MingDao, mingdaoShareParams);
-
-
-			//绿洲分享图片
-			ShareContent oasisShareParams = new ShareContent();
-			oasisShareParams.SetTitle("title");
-			oasisShareParams.SetText("text");
-			oasisShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
-			oasisShareParams.SetShareType(ContentType.Image);
-			content.SetShareContentCustomize(PlatformType.Oasis, oasisShareParams);
-
-
-			//telegram分享图片
-			ShareContent telegramShareParams = new ShareContent();
-			telegramShareParams.SetText("text");
-			telegramShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
-			telegramShareParams.SetShareType(ContentType.Image);
-			content.SetShareContentCustomize(PlatformType.Telegram, telegramShareParams);
-
-			////Tumblr分享视频
-			//ShareContent tumblrShareParams = new ShareContent();
-			//var files = System.IO.Directory.GetFiles(Application.dataPath, "cat.mp4", System.IO.SearchOption.AllDirectories);
-			//string filePath = files[0];
-			//tumblrShareParams.SetTitle("title");
-			//tumblrShareParams.SetMediaDataPath(filePath);
-			//tumblrShareParams.SetShareType(ContentType.Video);
-			//content.SetShareContentCustomize(PlatformType.Tumblr, tumblrShareParams);
-
-			//优先客户端分享
-			content.SetEnableClientShare(true);
-                
-            //使用微博API接口应用内分享 iOS only
-            //content.SetEnableSinaWeiboAPIShare(true);
-
-            //通过分享菜单分享
-            ssdk.ShowPlatformList (null, content, 100, 100);
-
-		}
-			
-		if (GUI.Button(new Rect((Screen.width - btnGap) / 2 + btnGap, btnTop, btnWidth, btnHeight), "Show Share View"))
-		{
-			ShareContent content = new ShareContent();
-			content.SetText("this is a test string.");
-			content.SetImageUrl("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
-			content.SetTitle("test title");
-			content.SetTitleUrl("http://www.mob.com");
-			content.SetSite("Mob-ShareSDK");
-			content.SetSiteUrl("http://www.mob.com");
-			content.SetUrl("http://www.mob.com");
-			content.SetComment("test description");
-			content.SetMusicUrl("http://mp3.mwap8.com/destdir/Music/2009/20090601/ZuiXuanMinZuFeng20090601119.mp3");
-			content.SetShareType(ContentType.Image);
-
-			ssdk.ShowShareContentEditor (PlatformType.SinaWeibo, content);
-		}
-#if UNITY_ANDROID
-
-#elif UNITY_IPHONE
-		btnTop += btnHeight + 20 * scale;
-		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "Share With Activity"))
-		{
-			//系统分享示例
-			ShareContent content = new ShareContent();
-			content.SetText("this is a test string.");
-			content.SetImageUrl("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
-			content.SetTitle("test title");
-			content.SetTitleUrl("http://www.mob.com");
-			content.SetUrl("http://www.mob.com");
-			content.SetShareType(ContentType.Image);
-			ssdk.ShareContentWithActivity (PlatformType.WeChat, content);
-		}
-#endif
-
-
-
-		btnTop += btnHeight + 20 * scale;
-        if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "Share Content"))
-		{
-
-            //抖音-分享本地视频
-            ShareContent content = new ShareContent();
-			//var files = System.IO.Directory.GetFiles(Application.dataPath, "cat.mp4", System.IO.SearchOption.AllDirectories);
-			//string filePath = files[0];
-			//content.SetUrl(filePath);
-			//分享图片到IM
-			content.SetImageUrl("http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg");
-			content.SetShareType(ContentType.Image);
-			content.SetDouyin_shareActionMode(1);
-            ssdk.ShareContent(PlatformType.Douyin, content);
-
-            /*iOS Only*/
-
-            ////※单个平台的分享示例如下※:
-
-            ////调用公用参数构造方法的,通过如下方式,如TikTok分享多图
-            //String[] imageArray = { "http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg", "http://ww3.sinaimg.cn/mw690/be159dedgw1evgxdt9h3fj218g0xctod.jpg" };
-            //content.SetImageArray(imageArray);
-            //content.SetShareType(ContentType.Image);
-            //ssdk.ShareContent(PlatformType.TikTok, content);
-
-
-            ////调用自定义的参数构造方法的,需要通过如下方式,如:KakaoTalk
-            //ShareContent customizeShareParams = new ShareContent();
-            //customizeShareParams.SetUrl("http://www.mob.com");
-            //customizeShareParams.SetShareType(ContentType.Webpage);
-            //customizeShareParams.SetTemplateId("11820");
-            //content.SetShareContentCustomize(PlatformType.KakaoTalk, customizeShareParams);
-            //ssdk.ShareContent(PlatformType.KakaoTalk, content);
-
-            ////快手SDK-分享私信
-            //ShareContent ksShareParams = new ShareContent();
-            //ksShareParams.SetTitle("title");
-            //ksShareParams.SetDesc("desc");
-            //ksShareParams.SetLinkURL("https://www.mob.com");
-            //ksShareParams.SetThumbImageUrl("http://download.sdk.mob.com/web/images/2019/07/30/14/1564468183056/750_750_65.12.png");
-            //ksShareParams.SetExtraInfo("message");
-            //ksShareParams.SetShareType(ContentType.Message);
-            //content.SetShareContentCustomize(PlatformType.KuaiShou, ksShareParams);
-            //ssdk.ShareContent(PlatformType.KuaiShou, content);
-
-            ////reddit分享链接
-            //ShareContent redditShareParams = new ShareContent();
-            //redditShareParams.SetText("text");
-            //redditShareParams.SetImageUrl("http://git.oschina.net/alexyu.yxj/MyTmpFiles/raw/master/kmk_pic_fld/small/107.JPG");
-            //redditShareParams.SetUrl("https://www.mob.com");
-            //redditShareParams.SetTitle("title");
-            //redditShareParams.SetShareType(ContentType.Webpage);
-            //content.SetShareContentCustomize(PlatformType.Reddit, redditShareParams);
-
-
-            // ShareContent content = new ShareContent();
-            // content.SetText("Test text");
-            // content.SetImageUrl("http://pic28.photophoto.cn/20130818/0020033143720852_b.jpg");
-            // ssdk.ShareContent (PlatformType.Twitter, content);
-
-        }
-
-		//if (GUI.Button(new Rect((Screen.width - btnGap) / 2 + btnGap, btnTop, btnWidth, btnHeight), "Get Friends SinaWeibo "))
-		//{
-		//获取新浪微博好友,第一页,每页15条数据
-		//print ("Click Btn Of Get Friends SinaWeibo");
-		//			ssdk.GetFriendList (PlatformType.SinaWeibo, 15, 0);
-		//ssdk.openMiniProgram("gh_afb25ac019c9","pages/index/index",0);
-		//}
-
-		btnTop += btnHeight + 20 * scale;
-        if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "Get Token "))
-		{
-			Hashtable authInfo = ssdk.GetAuthInfo (PlatformType.WeChat);			
-			print ("share result :");
-			print (MiniJSON.jsonEncode(authInfo));
-		}
-			
-		//if (GUI.Button(new Rect((Screen.width - btnGap) / 2 + btnGap , btnTop, btnWidth, btnHeight), "Close SSO Auth"))
-		//{
-			//ssdk.DisableSSO (true);			
-		//}
-
-		btnTop += btnHeight + 20 * scale;
-        if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "Remove Authorize "))
-		{
-			ssdk.CancelAuthorize (PlatformType.WeChat);			
-		}
-
-        //if (GUI.Button(new Rect((Screen.width - btnGap) / 2 + btnGap, btnTop, btnWidth, btnHeight), "Add Friend "))
-        //{
-        //关注新浪微博
-        //ssdk.AddFriend (PlatformType.SinaWeibo, "3189087725");			
-        //}
-
-        btnTop += btnHeight + 20 * scale;
-		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "ShareWithContentName(iOS only)"))
-		{
-			Hashtable customFields = new Hashtable ();
-			customFields["imgUrl"] = "http://ww1.sinaimg.cn/mw690/006dJESWgw1f6iyb8bzraj31kw0v67a2.jpg";
-			//根据配置文件分享【本接口功能仅暂时支持iOS】
-			ssdk.ShareWithContentName(PlatformType.SinaWeibo, "ShareSDK", customFields);		
-		}
-
-		//btnTop += btnHeight + 20 * scale;
-		//if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "ShowShareMenuWithContentName(iOS only)"))
-		//{
-		//	Hashtable customFields = new Hashtable ();
-		//	customFields["imgUrl"] = "http://ww1.sinaimg.cn/mw690/006dJESWgw1f6iyb8bzraj31kw0v67a2.jpg";
-		//	//根据配置文件展示分享菜单分享【本接口功能仅暂时支持iOS】
-		//	ssdk.ShowPlatformListWithContentName ("ShareSDK", customFields, null, 100, 100);
-		//}
-
-		btnTop += btnHeight + 20 * scale;
-		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "ShowShareViewWithContentName(iOS only)"))
-		{
-			Hashtable customFields = new Hashtable ();
-			//根据配置文件展示编辑界面分享【本接口功能仅暂时支持iOS】
-			customFields["imgUrl"] = "http://ww1.sinaimg.cn/mw690/006dJESWgw1f6iyb8bzraj31kw0v67a2.jpg";
-			ssdk.ShowShareContentEditorWithContentName(PlatformType.SinaWeibo, "ShareSDK", customFields);		
-		}
-
-		btnTop += btnHeight + 20 * scale;
-		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "SMS Authorize(Android only)"))
-		{
-			ssdk.Authorize(PlatformType.SMS);		
-		}
-
-		btnTop += btnHeight + 20 * scale;
-		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "submitPolicyGrantResult"))
-		{
-			
-			Debug.Log("ssdk ======> " + ssdk);
-			Debug.Log("mobsdk ======> " + mobsdk);
-			
-			mobsdk.submitPolicyGrantResult(true);
-			Debug.Log("mobsdk submitPolicyGrantResult======> " + mobsdk.submitPolicyGrantResult(true).ToString());
-		}
-
-		btnTop += btnHeight + 20 * scale;
-		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "getPrivacyPolicy"))
-		{
-			
-			Debug.Log("ssdk ======> " + ssdk);
-			Debug.Log("mobsdk ======> " + mobsdk);
-			#if UNITY_IPHONE
-            mobsdk.getPrivacyPolicy(true,mobsdk.getDeviceCurrentLanguage());
-#elif UNITY_ANDROID
-			mobsdk.getPrivacyPolicy(true, "en");
-			Debug.Log("mobsdk getPrivacyPolicy======> " + mobsdk.getPrivacyPolicy(true, "en"));
-#endif
-		}
-
-
-		btnTop += btnHeight + 20 * scale;
-		if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "Open wxMiniProgram(iOS only)"))
-		{
-#if UNITY_IPHONE
-			ssdk.openMiniProgram("gh_afb25ac019c9", "pages/index/index", 0);
-#elif UNITY_ANDROID
-#endif
-
-		}
-
-		btnTop += btnHeight + 20 * scale;
-		if (GUI.Button(new Rect((Screen.width - btnGap) / 2 - btnWidth, btnTop, btnWidth, btnHeight), "Share wxMiniProgram"))
-		{
-#if UNITY_IPHONE
-            ShareContent content = new ShareContent ();
-			content.SetTitle ("MiniProgram");
-			content.SetText ("test MiniProgram");
-			content.SetUrl("http://www.mob.com");
-			content.SetMiniProgramPath ("pages/index/index");
-			content.SetThumbImageUrl ("http://download.sdk.mob.com/web/images/2019/07/30/14/1564468183056/750_750_65.12.png");
-			content.SetMiniProgramHdThumbImage ("http://download.sdk.mob.com/web/images/2019/07/30/14/1564468183056/750_750_65.12.png");
-			content.SetMiniProgramUserName ("gh_afb25ac019c9");
-			content.SetMiniProgramWithShareTicket (true);
-            // iOS/Android 微信小程序的版本(0-正式,1-开发,2-体验)
-            content.SetMiniProgramType (0);
-			content.SetShareType (ContentType.MiniProgram);
-
-			ShareContent shareContent = new ShareContent ();
-			shareContent.SetShareContentCustomize (PlatformType.WeChat, content);
-			ssdk.ShareContent (PlatformType.WeChat, shareContent);
-#elif UNITY_ANDROID
-            ShareContent content = new ShareContent ();
-            content.SetTitle ("MiniProgram");
-            content.SetText ("test MiniProgram");
-            content.SetUrl("http://www.mob.com");
-            content.SetMiniProgramType (0);
-            content.SetMiniProgramUserName ("gh_52568203455c");
-            content.SetImageUrl("http://pic28.photophoto.cn/20130818/0020033143720852_b.jpg");
-            content.SetShareType (ContentType.MiniProgram);
-            
-            ShareContent shareContent = new ShareContent ();
-			shareContent.SetShareContentCustomize (PlatformType.WeChat, content);
-			ssdk.ShareContent (PlatformType.WeChat, shareContent);
-#endif
-		}
-
-      btnTop += btnHeight + 20 * scale;
-        if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "isClientValidForAndroid -QQ"))
-      {
-         ssdk.isClientValidForAndroid(PlatformType.QQ);
-      }
-
-
-      btnTop += btnHeight + 20 * scale;
-      if (GUI.Button(new Rect((Screen.width - btnGap) / 2 + btnGap, btnTop, btnWidth, btnHeight), "Share qqMiniProgram(iOS only)"))
-        {
-#if UNITY_IPHONE
-            ShareContent content = new ShareContent();
-            content.SetTitle("MiniProgram");
-            content.SetText("test MiniProgram");
-            content.SetUrl("http://www.mob.com");
-            content.SetThumbImageUrl("http://download.sdk.mob.com/web/images/2019/07/30/14/1564468183056/750_750_65.12.png");
-            content.SetMiniProgramPath("pages/index/index");
-            content.SetMiniProgramHdThumbImage("http://download.sdk.mob.com/web/images/2019/07/30/14/1564468183056/750_750_65.12.png");
-            content.SetMiniProgramAppID("1109762672");
-            content.SetMiniProgramWebpageUrl("www.qq.com");
-            //iOS/Android QQ小程序的类型,默认正式版(3),可选测试版(1)、预览版(4)
-            content.SetMiniProgramType(3);
-            content.SetShareType(ContentType.MiniProgram);
-
-            ShareContent shareContent = new ShareContent();
-            shareContent.SetShareContentCustomize(PlatformType.QQ, content);
-            ssdk.ShareContent(PlatformType.QQ, shareContent);
-
-#elif UNITY_ANDROID
-            //===============================================================
-            //when you test QQ miniprogram, you should use this params
-            //At the same time, the package name and signature should 
-            //correspond to the package name signature of the specific 
-            //QQ sharing small program applied in the background of tencent
-            //===============================================================
-            //ShareContent content = new ShareContent();
-            //content.SetTitle("MiniProgram");
-            //content.SetText("test MiniProgram");
-            //content.SetTitleUrl("http://www.mob.com");
-            //content.SetImageUrl("http://www.3wyu.com/wp-content/uploads/6e0eaf15gy1fvr5tnm2dfj20f108gtad.jpg");//必须为网络图片
-            //content.SetShareType(ContentType.QQ_MINI_PROGRAM);
-            //content.SetMiniProgramAppID("1108318575");
-            //content.SetMiniProgramPath("page/share/index.html?share_name=QQ%E9%9F%B3%E4%B9%90&share_key=5aIqFGg&from=disk");
-            //content.SetQQMiniProgramType("");
-
-            //ShareContent shareContent = new ShareContent();
-            //shareContent.SetShareContentCustomize(PlatformType.QQ, content);
-            //ssdk.ShareContent(PlatformType.QQ, shareContent);
-#endif
-		}
-
-		//btnTop += btnHeight + 20 * scale;
-		//if (GUI.Button(new Rect((Screen.width - btnWidth2) / 2, btnTop, btnWidth2, btnHeight), "Share Sina LinkCard"))
-		//{
-		//#if UNITY_IPHONE
-		//ShareContent content = new ShareContent();
-		//content.SetText("sina LinkCard");
-		//content.SetUrl("http://www.mob.com");
-		//content.SetImageUrl("http://www.mob.com/assets/images/ShareSDK_pic_1-09d293a6.png");//必须为网络图片
-		//content.SetSinaLinkCard(true);
-		//content.SetSinaCardTitle("这是Title");
-		//content.SetSinaCardSummary("这是Summary");
-		//content.SetShareType(ContentType.Webpage);
-
-		//ShareContent shareContent = new ShareContent();
-		//shareContent.SetShareContentCustomize(PlatformType.SinaWeibo, content);
-		//ssdk.ShareContent(PlatformType.SinaWeibo, shareContent);
-
-
-		//#elif UNITY_ANDROID
-		//JsonData jsonData = new JsonData();
-		//jsonData["url"] = "http://wx4.sinaimg.cn/large/006WfoFPly1fq0jo9svnaj30dw0dwdhv.jpg";
-		//jsonData["width"] = "120";
-		//jsonData["height"] = "120";
-
-
-		//ShareContent content = new ShareContent();
-		//content.SetText("sina LinkCard");
-		//content.SetSinaCardCreateAtAndroid("2019-01-24");
-		//content.SetSinaCardDisplayNameAndroid("displayName");
-		//content.SetSinaCardSummary("Summary");
-		//content.SetSinaCardURLAndroid("http://www.mob.com/");
-		//content.SetSinaCardTypeAndroid("webpage");
-		//content.SetSinaCardImageAndroid(jsonData);
-		//content.SetEnableClientShare(true);
-
-		//ShareContent shareContent = new ShareContent();
-		//shareContent.SetShareContentCustomize(PlatformType.SinaWeibo, content);
-
-		//ssdk.ShareContent(PlatformType.SinaWeibo, shareContent);
-		//#endif
-		//}
-	}
-	
-	void OnAuthResultHandler(int reqID, ResponseState state, PlatformType type, Hashtable result)
-	{
-		if (state == ResponseState.Success)
-		{
-			if (result != null && result.Count > 0) {
-				print ("authorize success !" + "Platform :" + type + "result:" + MiniJSON.jsonEncode(result));
-			} else {
-				print ("authorize success !" + "Platform :" + type);
-			}
-		}
-		else if (state == ResponseState.Fail)
-		{
-#if UNITY_ANDROID
-			print ("fail! throwable stack = " + result["stack"] + "; error msg = " + result["msg"]);
-#elif UNITY_IPHONE
-			print ("fail! error code = " + result["error_code"] + "; error msg = " + result["error_msg"]);
-#endif
-		}
-		else if (state == ResponseState.Cancel) 
-		{
-			print ("cancel !");
-		}
-	}
-	
-	void OnGetUserInfoResultHandler (int reqID, ResponseState state, PlatformType type, Hashtable result)
-	{
-		if (state == ResponseState.Success)
-		{
-			print ("get user info result :");
-			print (MiniJSON.jsonEncode(result));
-            print ("AuthInfo:" + MiniJSON.jsonEncode (ssdk.GetAuthInfo (type)));
-			print ("Get userInfo success !Platform :" + type );
-		}
-		else if (state == ResponseState.Fail)
-		{
-#if UNITY_ANDROID
-			print ("fail! throwable stack = " + result["stack"] + "; error msg = " + result["msg"]);
-#elif UNITY_IPHONE
-			print ("fail! error code = " + result["error_code"] + "; error msg = " + result["error_msg"]);
-#endif
-		}
-		else if (state == ResponseState.Cancel) 
-		{
-			print ("cancel !");
-		}
-	}
-	
-	void OnShareResultHandler (int reqID, ResponseState state, PlatformType type, Hashtable result)
-	{
-		if (state == ResponseState.Success)
-		{
-			print ("share successfully - share result :");
-			print (MiniJSON.jsonEncode(result));
-		}
-		else if (state == ResponseState.Fail)
-		{
-#if UNITY_ANDROID
-			print ("fail! throwable stack = " + result["stack"] + "; error msg = " + result["msg"]);
-#elif UNITY_IPHONE
-			print ("fail! error code = " + result["error_code"] + "; error msg = " + result["error_msg"]);
-#endif
-		}
-		else if (state == ResponseState.Cancel) 
-		{
-			print ("cancel !");
-		}
-	}
-
-	void OnGetFriendsResultHandler (int reqID, ResponseState state, PlatformType type, Hashtable result)
-	{
-		if (state == ResponseState.Success)
-		{			
-			print ("get friend list result :");
-			print (MiniJSON.jsonEncode(result));
-		}
-		else if (state == ResponseState.Fail)
-		{
-#if UNITY_ANDROID
-			print ("fail! throwable stack = " + result["stack"] + "; error msg = " + result["msg"]);
-#elif UNITY_IPHONE
-			print ("fail! error code = " + result["error_code"] + "; error msg = " + result["error_msg"]);
-#endif
-		}
-		else if (state == ResponseState.Cancel) 
-		{
-			print ("cancel !");
-		}
-	}
-
-	void OnFollowFriendResultHandler (int reqID, ResponseState state, PlatformType type, Hashtable result)
-	{
-		if (state == ResponseState.Success)
-		{
-			print ("Follow friend successfully !");
-		}
-		else if (state == ResponseState.Fail)
-		{
-#if UNITY_ANDROID
-			print ("fail! throwable stack = " + result["stack"] + "; error msg = " + result["msg"]);
-#elif UNITY_IPHONE
-			print ("fail! error code = " + result["error_code"] + "; error msg = " + result["error_msg"]);
-#endif
-		}
-		else if (state == ResponseState.Cancel) 
-		{
-			print ("cancel !");
-		}
-	}
-
-   void onIsClientValidForAndroid (int reqID, ResponseState state, PlatformType type, Hashtable result)
-   {
-      if (state == ResponseState.Success)
-      {
-         print ("IsClientValidForAndroid successfully !");
-          print ("IsClientValidForAndroid:" + MiniJSON.jsonEncode (MiniJSON.jsonEncode(result)));
-      }
-      else if (state == ResponseState.Fail)
-      {
-         print ("IsClientValidForAndroid Fail !");
-      }
-      else if (state == ResponseState.Cancel)
-      {
-         print ("cancel !");
-      }
-   }
-
-    public static void OnRestoreScene(RestoreSceneInfo scene)
-    {
-        Hashtable customParams = scene.customParams; 
-        if (customParams != null)
-        {
-            Debug.Log("[sharesdk-unity-Demo]OnRestoreScen(). path:" + scene.path.ToString() + ", params:" + scene.customParams.toJson());
-        }
-        else
-        {
-            Debug.Log("[sharesdk-unity-Demo]OnRestoreScen(). path:" + scene.path.ToString() + ", params:null");
-        }
-
-        //根据scene开发者自己处理场景转换
-        //SceneManager.LoadScene("SceneA");
-    }
-
-
-#if UNITY_IPHONE
-
-    public static void GetWXRequestTokenResultHandler(String authcode, sendWXRequestToken send)
-    {
-        Debug.Log("[GetWXRequestTokenResultHandler:" + authcode);
-        send("11", "22");
-    }
-
-    public static void GetWXRefreshTokenResultHandler(String uid, sendWXRefreshToken send)
-    {
-        send("11");
-    }
-#endif
-    //隐私协议回调
-	public static void OnFollowGetPolicy(string url)
-	{
-		Debug.Log("[OnFollowGetPolicy:" + url);
-	}
-}

+ 3 - 3
GameClient/Assets/Editor/Bat/commitGame.bat

@@ -1,15 +1,15 @@
 cd ../../Res
 svn add . --force
-svn ci -m "锟斤拷锟矫伙拷锟结交"
+svn ci -m "公用机提交"
 
 cd ../Game/CSShare
 git add .
-git commit -am "锟斤拷锟矫伙拷锟结交"
+git commit -am "公用机提交"
 git pull
 git push
 
 cd ../../../../
 git add .
-git commit -am "锟斤拷锟矫伙拷锟结交"
+git commit -am "公用机提交"
 git pull
 git push

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Assets/PrefabManager.cs

@@ -1,9 +1,9 @@
 using GFGGame.Launcher;
-using System.Threading.Tasks;
 using UniFramework.Pooling;
 using UnityEngine;
 using YooAsset;
 using System.Collections.Generic;
+using Log = ET.Log;
 
 namespace GFGGame
 {
@@ -45,6 +45,7 @@ namespace GFGGame
             }
 
             var handle = _entitySpawner.SpawnSync(resPath);
+            Log.Debug(resPath);
             AssetReleaserHelper.AddReleaserToSpawnObj(handle.GameObj, resPath, handle);
             return handle.GameObj;
         }

+ 0 - 12
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -304,18 +304,6 @@ namespace GFGGame
 
         public static void QuitToLoginView(bool logout, bool fromSdkLogoutCallback = false)
         {
-            switch (LauncherConfig.ChannelId)
-            {
-                case (int)ChannelID.DouYou:
-                    //QDDouYouManager.Instance.LoginOutBefore();
-                    break;
-                case (int)ChannelID.DouYouDev:
-                    QDDouYouManager.Instance.LoginOutBefore();
-                    break;
-                default:
-                    break;
-            }
-
             FieldDataManager.Instance.waitToShowFieldFightEndView = false;
             GameGlobal.AutoSevenDayLoginView = true;
             GameGlobal.AutoDailySignView = true;

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs

@@ -286,7 +286,7 @@ namespace GFGGame
 
         public static async ETTask ReqEnterGame()
         {
-            BuglyAgent.SetUserId(RoleDataManager.roleName + VersionController.Instance.PackageVersion);
+            //BuglyAgent.SetUserId(RoleDataManager.roleName + VersionController.Instance.PackageVersion);
             ViewManager.Show<ModalStatusView>("请求进入游戏...");
             int errorCode = await LoginHelper.GetRealmKey(GameGlobal.zoneScene);
             if (errorCode != ErrorCode.ERR_Success)

+ 0 - 4
GameClient/Assets/Game/HotUpdate/Data/ItemDataManager.cs

@@ -430,10 +430,6 @@ namespace GFGGame
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
             List<SuitFosterCfg> fosterCfgs = SuitFosterCfgArray.Instance.GetCfgsBysuitId(itemCfg.suitId);
             SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(fosterCfgs[0].suitId2);
-            if (suitCfg == null)
-            {
-             Log.Error($"");   
-            }
             for (int i = 0; i < suitCfg.partsArr.Length; i++)
             {
                 ItemCfg itemPartCfg = ItemCfgArray.Instance.GetCfg(suitCfg.partsArr[i]);

+ 2 - 11
GameClient/Assets/Game/HotUpdate/Data/ShopViewManager.cs

@@ -74,17 +74,8 @@ namespace GFGGame
 
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
 
-            try
-            {
-                item.m_txtName.text = shopCfg.itemName;
-                item.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
-            }
-            catch (Exception e)
-            {
-                Console.WriteLine(e);
-                throw;
-            }
-            
+            item.m_txtName.text = shopCfg.itemName;
+            item.m_icon.url = ResPathUtil.GetIconPath(itemCfg);
 
             item.m_grpDiscount.visible = shopCfg.Price < shopCfg.originalPrice;
             if (item.m_grpDiscount.visible)

+ 1 - 1
GameClient/Assets/Game/HotUpdate/ETCodes/ETManager.cs

@@ -27,7 +27,7 @@ namespace GFGGame
             TimeInfo.Instance.TimeZone = 8;
             try
             {
-                Game.EventSystem.Add(HotUpdateCodeLoader.Instance.GetTypes());
+                //Game.EventSystem.Add(HotUpdateCodeLoader.Instance.GetTypes());
 
                 Game.Scene.AddComponent<TimerComponent>();
                 Game.Scene.AddComponent<CoroutineLockComponent>();

+ 7 - 7
GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Login/LoginHelper.cs

@@ -12,7 +12,7 @@ namespace ET
             Session accountSession = null;
             try
             {
-                accountSession = zoneScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(address));
+                accountSession = zoneScene.GetComponent<NetWSComponent>().Create(NetworkHelper.ToIPEndPoint(address));
 
                 a2CLoginAccount = (A2C_LoginAccount)await accountSession.Call(new C2A_LoginTest()
                 {
@@ -21,7 +21,7 @@ namespace ET
                     PlatformId = LauncherConfig.platformId,
                     ChannelId = LauncherConfig.ChannelId,
                     CancelDelete = cancelDelete,
-                    Token = QDDouYouManager.Instance.token
+                    Token = ""
                 });
             }
             catch (Exception e)
@@ -49,7 +49,7 @@ namespace ET
             Session accountSession = null;
             try
             {
-                accountSession = zoneScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(address));
+                accountSession = zoneScene.GetComponent<NetWSComponent>().Create(NetworkHelper.ToIPEndPoint(address));
                 var passwordMD5 = password;
                 //密码禁止明文传输
                 if (!isMD5)
@@ -107,7 +107,7 @@ namespace ET
             Session session = null;
             try
             {
-                session = zoneScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(address));
+                session = zoneScene.GetComponent<NetWSComponent>().Create(NetworkHelper.ToIPEndPoint(address));
                 {
                     //密码禁止明文传输
                     var passwordMD5 = MD5Helper.stringMD5(password);
@@ -322,7 +322,7 @@ namespace ET
             //1.连接Realm,获取分配的Gate
             R2C_LoginRealm r2C_LoginRealm = null;
 
-            Session session = zoneScene.GetComponent<NetKcpComponent>()
+            Session session = zoneScene.GetComponent<NetWSComponent>()
                 .Create(NetworkHelper.ToIPEndPoint(realmAddress));
             try
             {
@@ -347,7 +347,7 @@ namespace ET
             }
 
             LogUtil.LogDev($"GateAddress : {r2C_LoginRealm.GateAddress}");
-            Session gateSession = zoneScene.GetComponent<NetKcpComponent>()
+            Session gateSession = zoneScene.GetComponent<NetWSComponent>()
                 .Create(NetworkHelper.ToIPEndPoint(r2C_LoginRealm.GateAddress));
             gateSession.AddComponent<PingComponent>();
             gateSession.AddComponent<DisConnectedCompnent>().SessionState = SessionState.Gate;
@@ -452,7 +452,7 @@ namespace ET
             if (accountSession == null || accountSession.IsDisposed)
             {
                 notLogin = true;
-                accountSession = GameGlobal.zoneScene.GetComponent<NetKcpComponent>()
+                accountSession = GameGlobal.zoneScene.GetComponent<NetWSComponent>()
                     .Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress));
             }
 

+ 1 - 1
GameClient/Assets/Game/HotUpdate/ETCodes/Hotfix/App/Scene/SceneFactory.cs

@@ -10,7 +10,7 @@ namespace ET
         {
             Scene zoneScene = EntitySceneFactory.CreateScene(Game.IdGenerater.GenerateInstanceId(), zone, SceneType.Zone, name, parent);
             zoneScene.AddComponent<ZoneSceneFlagComponent>();
-            zoneScene.AddComponent<NetKcpComponent, int>(SessionStreamDispatcherType.SessionStreamDispatcherClientOuter);
+            zoneScene.AddComponent<NetWSComponent, int>(SessionStreamDispatcherType.SessionStreamDispatcherClientOuter);
             zoneScene.AddComponent<CurrentScenesComponent>();
             zoneScene.AddComponent<ObjectWait>();
             zoneScene.AddComponent<PlayerComponent>();

+ 4 - 4
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs

@@ -13,13 +13,13 @@ namespace UI.ActivityThemeLuckyBox
         public GGraph m_bgEffectHolder;
         public GButton m_btnBack;
         public UI_Button1 m_btnChapter;
-        public UI_Button1 m_btnLuckyBox;
         public UI_Button1 m_btnTask;
         public UI_Button1 m_btnShop;
         public GTextField m_timeDesc;
         public GTextField m_txtTime;
         public GTextField m_txtTime_4;
         public GButton m_btnLuckyBox_old;
+        public UI_Button1 m_btnLuckyBox;
         public GImage m_mask;
         public GLoader m_icon_5;
         public GTextField m_txtTime_5;
@@ -79,13 +79,13 @@ namespace UI.ActivityThemeLuckyBox
             m_bgEffectHolder = (GGraph)comp.GetChild("bgEffectHolder");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnChapter = (UI_Button1)UI_Button1.Create(comp.GetChild("btnChapter"));
-            m_btnLuckyBox = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLuckyBox"));
             m_btnTask = (UI_Button1)UI_Button1.Create(comp.GetChild("btnTask"));
             m_btnShop = (UI_Button1)UI_Button1.Create(comp.GetChild("btnShop"));
             m_timeDesc = (GTextField)comp.GetChild("timeDesc");
             m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_txtTime_4 = (GTextField)comp.GetChild("txtTime_4");
             m_btnLuckyBox_old = (GButton)comp.GetChild("btnLuckyBox_old");
+            m_btnLuckyBox = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLuckyBox"));
             m_mask = (GImage)comp.GetChild("mask");
             m_icon_5 = (GLoader)comp.GetChild("icon_5");
             m_txtTime_5 = (GTextField)comp.GetChild("txtTime_5");
@@ -103,8 +103,6 @@ namespace UI.ActivityThemeLuckyBox
             m_btnBack = null;
             m_btnChapter.Dispose();
             m_btnChapter = null;
-            m_btnLuckyBox.Dispose();
-            m_btnLuckyBox = null;
             m_btnTask.Dispose();
             m_btnTask = null;
             m_btnShop.Dispose();
@@ -113,6 +111,8 @@ namespace UI.ActivityThemeLuckyBox
             m_txtTime = null;
             m_txtTime_4 = null;
             m_btnLuckyBox_old = null;
+            m_btnLuckyBox.Dispose();
+            m_btnLuckyBox = null;
             m_mask = null;
             m_icon_5 = null;
             m_txtTime_5 = null;

+ 58 - 58
GameClient/Assets/Game/HotUpdate/Platform/AliPay/AliManager.cs

@@ -1,58 +1,58 @@
-using System;
-using ET;
-using UnityEngine;
-using GFGGame.Launcher;
-
-namespace GFGGame
-{
-    public class AliManagerr : SingletonBase<AliManagerr>
-    {
-        public void Init()
-        {
-#if GFGZSB
-                         AliPayManagerInit.Instance.aliSDKListener = new AliPaySDKListener();     
-#endif
-        }
-        
-        //支付宝支付
-        public void Pay(string orderStr)
-        {
-            AliPayManagerInit.Instance.ShowSwitchPayment(orderStr);
-        }
-
-        //微信支付
-        public void PayVx(string appId, string mchId, string prepayId, string packageValue,
-            string nonceStr, string timestamp, string sign, string callBackObjectName = "AliPayGameObject",
-            string callBackFuncName = "VxPayReceive")
-        {
-            AliPayManagerInit.Instance.VxShowSwitchPayment(appId, mchId, prepayId, packageValue,
-                nonceStr, timestamp, sign, callBackObjectName, callBackFuncName);
-        }
-    }
-
-#if GFGZSB
-    /// <summary>
-    /// SDK回调
-    /// </summary>
-    public class AliPaySDKListener : IAliSDKListener
-    {
-        public void AliPayReceiveAb(string message)
-        {
-            Debug.Log("Game.HotUpdate AliPayReceiveAb: " + message);
-        }
-
-        public void VxPayReceiveAb(string message)
-        {
-            if (message == "0")
-            {
-                ViewManager.Hide<StorePayPropView>(); 
-            }
-            else
-            {
-                PromptController.Instance.ShowFloatTextPrompt("支付失败");
-            }
-            Debug.Log("Game.HotUpdate VxPayReceiveAb: " + message);
-        }
-    }
-#endif
-}
+// using System;
+// using ET;
+// using UnityEngine;
+// using GFGGame.Launcher;
+//
+// namespace GFGGame
+// {
+//     public class AliManagerr : SingletonBase<AliManagerr>
+//     {
+//         public void Init()
+//         {
+// #if GFGZSB
+//                          AliPayManagerInit.Instance.aliSDKListener = new AliPaySDKListener();     
+// #endif
+//         }
+//         
+//         //支付宝支付
+//         public void Pay(string orderStr)
+//         {
+//             AliPayManagerInit.Instance.ShowSwitchPayment(orderStr);
+//         }
+//
+//         //微信支付
+//         public void PayVx(string appId, string mchId, string prepayId, string packageValue,
+//             string nonceStr, string timestamp, string sign, string callBackObjectName = "AliPayGameObject",
+//             string callBackFuncName = "VxPayReceive")
+//         {
+//             AliPayManagerInit.Instance.VxShowSwitchPayment(appId, mchId, prepayId, packageValue,
+//                 nonceStr, timestamp, sign, callBackObjectName, callBackFuncName);
+//         }
+//     }
+//
+// #if GFGZSB
+//     /// <summary>
+//     /// SDK回调
+//     /// </summary>
+//     public class AliPaySDKListener : IAliSDKListener
+//     {
+//         public void AliPayReceiveAb(string message)
+//         {
+//             Debug.Log("Game.HotUpdate AliPayReceiveAb: " + message);
+//         }
+//
+//         public void VxPayReceiveAb(string message)
+//         {
+//             if (message == "0")
+//             {
+//                 ViewManager.Hide<StorePayPropView>(); 
+//             }
+//             else
+//             {
+//                 PromptController.Instance.ShowFloatTextPrompt("支付失败");
+//             }
+//             Debug.Log("Game.HotUpdate VxPayReceiveAb: " + message);
+//         }
+//     }
+// #endif
+// }

+ 265 - 265
GameClient/Assets/Game/HotUpdate/Platform/QDDouYouManager.cs

@@ -1,265 +1,265 @@
-using System;
-using ET;
-using UnityEngine;
-using GFGGame.Launcher;
-
-namespace GFGGame
-{
-    public class QDDouYouManager : SingletonBase<QDDouYouManager>
-    {
-        public bool isLogining;
-        public string uid;
-        public string token;
-
-        public void Init()
-        {
-            Debug.Log("实例化DouYouSDKListener");
-            QDDouYouManagerInit.Instance.douYouSDKListener = new DouYouSDKListener();
-        }
-
-        public void Login()
-        {
-            // if (!string.IsNullOrEmpty(uid))
-            // {
-            //     EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, uid);
-            //     return;
-            // }
-            // if (isLogining) return;
-            // Debug.Log($"quick Login");
-            // isLogining = true;
-            QDDouYouManagerInit.Instance.ShowLogin();
-        }
-
-        public void OnCreateRole()
-        {
-            QDManager.PushRoleAction(DouYouRoleLogReportType.CreateRole);
-        }
-
-        public void OnEnterGame()
-        {
-            var zoneScene = GameGlobal.zoneScene;
-            if (zoneScene == null) return;
-            
-            if (zoneScene.GetComponent<RoleInfosComponent>() == null ||
-                zoneScene.GetComponent<RoleInfosComponent>().IsDisposed) return;
-            
-            var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
-            if (roleInfo == null) return;
-            
-            if (GameGlobal.myNumericComponent == null) return;
-            int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
- 
-            if (zoneScene.GetComponent<ServerInfosComponent>() == null) return;
-            if (zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo == null) return;
-
-            string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
-
-            QDDouYouManagerInit.Instance.ReportRoleLogin(roleInfo.Id.ToString(), lvl.ToString(), roleInfo.Name,
-                roleInfo.ServerId.ToString(), serverName);
-            QDManager.PushRoleAction(DouYouRoleLogReportType.EnterGame);
-        }
-
-        public void OnQuitToLoginView()
-        {
-            Debug.Log($"DouYou OnQuitToLoginView");
-        }
-
-        public void Logout()
-        {
-            Debug.Log($"Game.HotUpdate DouYou Logout");
-            QDDouYouManagerInit.Instance.ShowLogout();
-        }
-
-        public void LoginOutBefore()
-        {
-            QDManager.PushRoleAction(DouYouRoleLogReportType.ExitGame);
-        }
-
-        public void Pay(int buyID, int count, string orderID, long price)
-        {
-            ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(buyID);
-            if (shopCfg == null)
-            {
-                Log.Error($"recharge {buyID} config not found!");
-                return;
-            }
-
-            ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
-            if (itemCfg == null)
-            {
-                Log.Error($"recharge {buyID} itemCfgId:{shopCfg.itemId} config not found!");
-                return;
-            }
-
-            var zoneScene = GameGlobal.zoneScene;
-            if (zoneScene == null) return;
-            
-            if (zoneScene.GetComponent<RoleInfosComponent>() == null ||
-                zoneScene.GetComponent<RoleInfosComponent>().IsDisposed) return;
-            
-            var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
-            if (roleInfo == null) return;
-            
-            if (GameGlobal.myNumericComponent == null) return;
-            int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
- 
-            if (zoneScene.GetComponent<ServerInfosComponent>() == null) return;
-            if (zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo == null) return;
-
-            string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
-
-            //自定义参数
-            string other = orderID + "|gfg|" + roleInfo.Id;
-            QDDouYouManagerInit.Instance.ShowSwitchPayment(orderID, price.ToString(), buyID.ToString(),
-                shopCfg.itemName, string.Empty,
-                roleInfo.ServerId.ToString(), serverName, roleInfo.Id.ToString(), roleInfo.Name, lvl.ToString(), other);
-        }
-
-        public void Exit()
-        {
-            QDManager.PushRoleAction(DouYouRoleLogReportType.ExitGame);
-            QDDouYouManagerInit.Instance.ExitApp();
-        }
-    }
-
-    /// <summary>
-    /// SDK回调
-    /// </summary>
-    public class DouYouSDKListener : IDouYouSDKListener
-    {
-        // /// <summary>
-        // /// 测试消息
-        // /// </summary>
-        // /// <param name="message"></param>
-        // public void ReceiveMessageAb(string message)
-        // {
-        //     Debug.Log($"Game.HotUpdate ReceiveMessageAb:{message}");
-        // }
-
-        /// <summary>
-        /// SDK实例化成功
-        /// </summary>
-        /// <param name="message">SDK 实例化成功</param>
-        public void InitSuccessAb(string message)
-        {
-            Debug.Log("Game.HotUpdate InitSuccessAb: " + message);
-        }
-
-        /// <summary>
-        /// 登录成功 
-        /// </summary>
-        /// <param name="message">resUid + "|gfg|" + token</param>
-        public void LoginSuccessAb(string message)
-        {
-            Debug.Log("Game.HotUpdate LoginSuccessAb: " + message);
-            string[] result = message.Split(new string[] { "|gfg|" }, StringSplitOptions.None);
-
-            QDDouYouManager.Instance.isLogining = false;
-            QDDouYouManager.Instance.uid = result[0];
-            QDDouYouManager.Instance.token = result[1];
-            //登录成功的回调
-            EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, result[0]);
-        }
-
-        /// <summary>
-        /// 切换账号或退出登录后
-        /// </summary>
-        /// <param name="message">退出登录成功!</param>
-        public void OutLoginSuccessAb(string message)
-        {
-            Debug.Log("Game.HotUpdate OutLoginSuccessAb: " + message);
-            GameController.QuitToLoginView(true);
-            EventAgent.DispatchEvent(ConstMessage.OUT_LOGIN);
-        }
-
-        /// <summary>
-        /// 支付失败
-        /// </summary>
-        /// <param name="message">code + "|gfg|" + params.toString()</param>
-        public void PayFailAb(string message)
-        {
-            Debug.Log("Game.HotUpdate PayFailAb: " + message);
-            //改变临时订单状态为失败
-        }
-
-        /// <summary>
-        /// 支付成功
-        /// </summary>
-        /// <param name="message">code + "|gfg|" + params.toString()</param>
-        public void PaySuccessAb(string message)
-        {
-            Debug.Log("Game.HotUpdate PaySuccessAb" + message);
-            //改变临时订单状态为支付成功
-            QDManager.PushRoleAction(DouYouRoleLogReportType.Pay);
-        }
-
-        #region SDK 生命周期函数
-
-        public void SdkOnStartAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnStartAb:{message}");
-        }
-
-        public void SdkOnPauseAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnPauseAb:{message}");
-        }
-
-        public void SdkOnResumeAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnResumeAb:{message}");
-        }
-
-        public void SdkOnStopAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnStopAb:{message}");
-        }
-
-        public void SdkOnDestroyAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnDestroyAb:{message}");
-        }
-
-        public void SdkOnRestartAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnRestartAb:{message}");
-        }
-
-        public void SdkOnBackPressedAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnBackPressedAb:{message}");
-        }
-
-        public void SdkOnNewIntentAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnNewIntentAb:{message}");
-        }
-
-        public void SdkOnConfigurationChangedAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnConfigurationChangedAb:{message}");
-        }
-
-        public void SdkOnSaveInstanceStateAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnSaveInstanceStateAb:{message}");
-        }
-
-        public void SdkOnActivityResultAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnActivityResultAb:{message}");
-        }
-
-        public void SdkOnRequestPermissionResultAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnRequestPermissionResultAb:{message}");
-        }
-
-        public void SdkOnWindowFocusChangedAb(string message)
-        {
-            Debug.Log($"Game.HotUpdate SdkOnWindowFocusChangedAb:{message}");
-        }
-
-        #endregion
-    }
-}
+// using System;
+// using ET;
+// using UnityEngine;
+// using GFGGame.Launcher;
+//
+// namespace GFGGame
+// {
+//     public class QDDouYouManager : SingletonBase<QDDouYouManager>
+//     {
+//         public bool isLogining;
+//         public string uid;
+//         public string token;
+//
+//         public void Init()
+//         {
+//             Debug.Log("实例化DouYouSDKListener");
+//             QDDouYouManagerInit.Instance.douYouSDKListener = new DouYouSDKListener();
+//         }
+//
+//         public void Login()
+//         {
+//             // if (!string.IsNullOrEmpty(uid))
+//             // {
+//             //     EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, uid);
+//             //     return;
+//             // }
+//             // if (isLogining) return;
+//             // Debug.Log($"quick Login");
+//             // isLogining = true;
+//             QDDouYouManagerInit.Instance.ShowLogin();
+//         }
+//
+//         public void OnCreateRole()
+//         {
+//             QDManager.PushRoleAction(DouYouRoleLogReportType.CreateRole);
+//         }
+//
+//         public void OnEnterGame()
+//         {
+//             var zoneScene = GameGlobal.zoneScene;
+//             if (zoneScene == null) return;
+//             
+//             if (zoneScene.GetComponent<RoleInfosComponent>() == null ||
+//                 zoneScene.GetComponent<RoleInfosComponent>().IsDisposed) return;
+//             
+//             var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
+//             if (roleInfo == null) return;
+//             
+//             if (GameGlobal.myNumericComponent == null) return;
+//             int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+//  
+//             if (zoneScene.GetComponent<ServerInfosComponent>() == null) return;
+//             if (zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo == null) return;
+//
+//             string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
+//
+//             QDDouYouManagerInit.Instance.ReportRoleLogin(roleInfo.Id.ToString(), lvl.ToString(), roleInfo.Name,
+//                 roleInfo.ServerId.ToString(), serverName);
+//             QDManager.PushRoleAction(DouYouRoleLogReportType.EnterGame);
+//         }
+//
+//         public void OnQuitToLoginView()
+//         {
+//             Debug.Log($"DouYou OnQuitToLoginView");
+//         }
+//
+//         public void Logout()
+//         {
+//             Debug.Log($"Game.HotUpdate DouYou Logout");
+//             QDDouYouManagerInit.Instance.ShowLogout();
+//         }
+//
+//         public void LoginOutBefore()
+//         {
+//             QDManager.PushRoleAction(DouYouRoleLogReportType.ExitGame);
+//         }
+//
+//         public void Pay(int buyID, int count, string orderID, long price)
+//         {
+//             ShopCfg shopCfg = ShopCfgArray.Instance.GetCfg(buyID);
+//             if (shopCfg == null)
+//             {
+//                 Log.Error($"recharge {buyID} config not found!");
+//                 return;
+//             }
+//
+//             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
+//             if (itemCfg == null)
+//             {
+//                 Log.Error($"recharge {buyID} itemCfgId:{shopCfg.itemId} config not found!");
+//                 return;
+//             }
+//
+//             var zoneScene = GameGlobal.zoneScene;
+//             if (zoneScene == null) return;
+//             
+//             if (zoneScene.GetComponent<RoleInfosComponent>() == null ||
+//                 zoneScene.GetComponent<RoleInfosComponent>().IsDisposed) return;
+//             
+//             var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
+//             if (roleInfo == null) return;
+//             
+//             if (GameGlobal.myNumericComponent == null) return;
+//             int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
+//  
+//             if (zoneScene.GetComponent<ServerInfosComponent>() == null) return;
+//             if (zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo == null) return;
+//
+//             string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
+//
+//             //自定义参数
+//             string other = orderID + "|gfg|" + roleInfo.Id;
+//             QDDouYouManagerInit.Instance.ShowSwitchPayment(orderID, price.ToString(), buyID.ToString(),
+//                 shopCfg.itemName, string.Empty,
+//                 roleInfo.ServerId.ToString(), serverName, roleInfo.Id.ToString(), roleInfo.Name, lvl.ToString(), other);
+//         }
+//
+//         public void Exit()
+//         {
+//             QDManager.PushRoleAction(DouYouRoleLogReportType.ExitGame);
+//             QDDouYouManagerInit.Instance.ExitApp();
+//         }
+//     }
+//
+//     /// <summary>
+//     /// SDK回调
+//     /// </summary>
+//     public class DouYouSDKListener : IDouYouSDKListener
+//     {
+//         // /// <summary>
+//         // /// 测试消息
+//         // /// </summary>
+//         // /// <param name="message"></param>
+//         // public void ReceiveMessageAb(string message)
+//         // {
+//         //     Debug.Log($"Game.HotUpdate ReceiveMessageAb:{message}");
+//         // }
+//
+//         /// <summary>
+//         /// SDK实例化成功
+//         /// </summary>
+//         /// <param name="message">SDK 实例化成功</param>
+//         public void InitSuccessAb(string message)
+//         {
+//             Debug.Log("Game.HotUpdate InitSuccessAb: " + message);
+//         }
+//
+//         /// <summary>
+//         /// 登录成功 
+//         /// </summary>
+//         /// <param name="message">resUid + "|gfg|" + token</param>
+//         public void LoginSuccessAb(string message)
+//         {
+//             Debug.Log("Game.HotUpdate LoginSuccessAb: " + message);
+//             string[] result = message.Split(new string[] { "|gfg|" }, StringSplitOptions.None);
+//
+//             QDDouYouManager.Instance.isLogining = false;
+//             QDDouYouManager.Instance.uid = result[0];
+//             QDDouYouManager.Instance.token = result[1];
+//             //登录成功的回调
+//             EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, result[0]);
+//         }
+//
+//         /// <summary>
+//         /// 切换账号或退出登录后
+//         /// </summary>
+//         /// <param name="message">退出登录成功!</param>
+//         public void OutLoginSuccessAb(string message)
+//         {
+//             Debug.Log("Game.HotUpdate OutLoginSuccessAb: " + message);
+//             GameController.QuitToLoginView(true);
+//             EventAgent.DispatchEvent(ConstMessage.OUT_LOGIN);
+//         }
+//
+//         /// <summary>
+//         /// 支付失败
+//         /// </summary>
+//         /// <param name="message">code + "|gfg|" + params.toString()</param>
+//         public void PayFailAb(string message)
+//         {
+//             Debug.Log("Game.HotUpdate PayFailAb: " + message);
+//             //改变临时订单状态为失败
+//         }
+//
+//         /// <summary>
+//         /// 支付成功
+//         /// </summary>
+//         /// <param name="message">code + "|gfg|" + params.toString()</param>
+//         public void PaySuccessAb(string message)
+//         {
+//             Debug.Log("Game.HotUpdate PaySuccessAb" + message);
+//             //改变临时订单状态为支付成功
+//             QDManager.PushRoleAction(DouYouRoleLogReportType.Pay);
+//         }
+//
+//         #region SDK 生命周期函数
+//
+//         public void SdkOnStartAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnStartAb:{message}");
+//         }
+//
+//         public void SdkOnPauseAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnPauseAb:{message}");
+//         }
+//
+//         public void SdkOnResumeAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnResumeAb:{message}");
+//         }
+//
+//         public void SdkOnStopAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnStopAb:{message}");
+//         }
+//
+//         public void SdkOnDestroyAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnDestroyAb:{message}");
+//         }
+//
+//         public void SdkOnRestartAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnRestartAb:{message}");
+//         }
+//
+//         public void SdkOnBackPressedAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnBackPressedAb:{message}");
+//         }
+//
+//         public void SdkOnNewIntentAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnNewIntentAb:{message}");
+//         }
+//
+//         public void SdkOnConfigurationChangedAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnConfigurationChangedAb:{message}");
+//         }
+//
+//         public void SdkOnSaveInstanceStateAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnSaveInstanceStateAb:{message}");
+//         }
+//
+//         public void SdkOnActivityResultAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnActivityResultAb:{message}");
+//         }
+//
+//         public void SdkOnRequestPermissionResultAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnRequestPermissionResultAb:{message}");
+//         }
+//
+//         public void SdkOnWindowFocusChangedAb(string message)
+//         {
+//             Debug.Log($"Game.HotUpdate SdkOnWindowFocusChangedAb:{message}");
+//         }
+//
+//         #endregion
+//     }
+// }

+ 3 - 252
GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs

@@ -14,36 +14,6 @@ namespace GFGGame
             switch (LauncherConfig.ChannelId)
             {
                 case (int)ChannelID.Test:
-                    // AliManagerr.Instance.Init();
-                    // QDShareManager.Instance.Init();
-                    break;
-                case (int)ChannelID.DouYou:
-                    //QDDouYouManager.Instance.Init();
-                #if GFGZSB
-                AliManagerr.Instance.Init();
-                QDShareManager.Instance.Init();
-                #else                 
-                    if (LauncherConfig.platformId == 2)
-                    {
-                #if !UNITY_EDITOR && UNITY_IOS
-                QDDouYouManagerIos.Instance.Init();
-                #endif
-                    }
-                    else
-                    {
-                       QDDouYouManager.Instance.Init();
-                    }
-                #endif
-
-                    break;
-                case (int)ChannelID.DouYouDev:
-                    QDDouYouManager.Instance.Init();
-                    QDShareManager.Instance.Init();
-                    break;
-                case (int)ChannelID.AppStore:
-#if !UNITY_EDITOR && UNITY_IOS
-                    QDAppStoreManager.Init();
-#endif
                     break;
                 default:
                     break;
@@ -63,33 +33,6 @@ namespace GFGGame
                         ViewManager.Show<LoginInputView>();
                     }
 
-                    break;
-                case (int)ChannelID.DouYou:
-                    #if GFGZSB
-                    bool loginDouYou = GameController.CheckLoginCache(true);
-                    if (!loginDouYou)
-                    {
-                        ViewManager.Hide<ModalStatusView>();
-                        ViewManager.Show<LoginInputView>();
-                    }
-                    #else
-                    if (LauncherConfig.platformId == 2)
-                    {
-                    #if !UNITY_EDITOR && UNITY_IOS
-                     QDDouYouManagerIos.Instance.Login();
-                    #endif
-                    }
-                    else
-                    {
-                        QDDouYouManager.Instance.Login();
-                    }       
-                    #endif
-                    break;
-                case (int)ChannelID.DouYouDev:
-                    QDDouYouManager.Instance.Login();
-                    break;
-                case (int)ChannelID.AppStore:
-                    //TODO 接douyou ios的sdk登录
                     break;
                 default:
                     break;
@@ -102,17 +45,6 @@ namespace GFGGame
             {
                 case (int)ChannelID.Test:
 
-                    break;
-                case (int)ChannelID.DouYou:
-#if !GFGZSB
-                    if (LauncherConfig.platformId == 1)
-                    {
-                        QDDouYouManager.Instance.OnCreateRole();
-                    }
-#endif
-                    break;
-                case (int)ChannelID.DouYouDev:
-                    QDDouYouManager.Instance.OnCreateRole();
                     break;
                 default:
                     break;
@@ -125,26 +57,6 @@ namespace GFGGame
             {
                 case (int)ChannelID.Test:
 
-                    break;
-                case (int)ChannelID.DouYou:
-#if !GFGZSB
-                    if (LauncherConfig.platformId == 2)
-                    {
-#if !UNITY_EDITOR && UNITY_IOS
-                     QDDouYouManagerIos.Instance.OnEnterGame();
-#endif
-                    }
-                    else
-                    {
-                        QDDouYouManager.Instance.OnEnterGame();
-                    }
-#endif
-                    break;
-                case (int)ChannelID.DouYouDev:
-                    QDDouYouManager.Instance.OnEnterGame();
-                    break;
-                case (int)ChannelID.AppStore:
-                    //TODO 接入douYou sdk 
                     break;
                 default:
                     break;
@@ -158,26 +70,6 @@ namespace GFGGame
             {
                 case (int)ChannelID.Test:
 
-                    break;
-                case (int)ChannelID.DouYou:
-#if !GFGZSB
-                    if (LauncherConfig.platformId == 2)
-                    {
-#if !UNITY_EDITOR && UNITY_IOS
-          QDDouYouManagerIos.Instance.OnQuitToLoginView();      
-#endif
-                    }
-                    else
-                    {
-                        QDDouYouManager.Instance.OnQuitToLoginView();
-                    }
-#endif
-                    break;
-                case (int)ChannelID.DouYouDev:
-                    QDDouYouManager.Instance.OnQuitToLoginView();
-                    break;
-                case (int)ChannelID.AppStore:
-                    //TODO 接入douYou sdk 
                     break;
                 default:
                     break;
@@ -190,30 +82,6 @@ namespace GFGGame
             {
                 case (int)ChannelID.Test:
 
-                    break;
-                case (int)ChannelID.DouYou:
-#if GFGZSB
-         //TODO gfg支付跳转
-                    ViewManager.Show<StorePayPropView>(new object[] { buyID, orderID, price });
-#else
-                    if (LauncherConfig.platformId == 2)
-                    {
-#if !UNITY_EDITOR && UNITY_IOS
-                        QDDouYouManagerIos.Instance.Pay(buyID, count, orderID, price);
-#endif
-                    }
-                    else
-                    {
-                        QDDouYouManager.Instance.Pay(buyID, count, orderID, price);
-                    }              
-#endif
-                    
-                    break;
-                case (int)ChannelID.DouYouDev:
-                    QDDouYouManager.Instance.Pay(buyID, count, orderID, price);
-                    break;
-                case (int)ChannelID.AppStore:
-                    //TODO 接入douYou sdk 
                     break;
                 default:
                     break;
@@ -234,26 +102,6 @@ namespace GFGGame
             {
                 case (int)ChannelID.Test:
 
-                    break;
-                case (int)ChannelID.DouYou:
-                    #if !GFGZSB
-                    if (LauncherConfig.platformId == 2)
-                    {
-#if !UNITY_EDITOR && UNITY_IOS
-                        QDDouYouManagerIos.Instance.Logout();
-#endif
-                    }
-                    else
-                    {
-                        QDDouYouManager.Instance.Logout();
-                    }
-                    #endif
-                    break;
-                case (int)ChannelID.DouYouDev:
-                    QDDouYouManager.Instance.Logout();
-                    break;
-                case (int)ChannelID.AppStore:
-                    //TODO 接入douYou sdk 
                     break;
                 default:
                     break;
@@ -267,112 +115,15 @@ namespace GFGGame
                 case (int)ChannelID.Test:
                     GameController.ShowExitAlert();
                     break;
-                case (int)ChannelID.DouYou:
-#if GFGZSB
-              GameController.ShowExitAlert();     
-#else
-                    if (LauncherConfig.platformId == 2)
-                    {
-#if !UNITY_EDITOR && UNITY_IOS
-                        QDDouYouManagerIos.Instance.Exit();
-#endif
-                    }
-                    else
-                    {
-                        QDDouYouManager.Instance.Exit();
-                    }
-#endif
-                    break;
-                case (int)ChannelID.DouYouDev:
-                    QDDouYouManager.Instance.Exit();
-                    break;
-                case (int)ChannelID.AppStore:
-                    //TODO 接入douYou sdk 
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        //上报角色行为给sdk
-        public static void PushRoleAction(DouYouRoleLogReportType reportType)
-        {
-            switch (LauncherConfig.ChannelId)
-            {
-                case (int)ChannelID.Test:
-
-                    break;
-                case (int)ChannelID.DouYou:
-                    //改名上报给sdk
-                    // var zoneScene = GameGlobal.zoneScene;
-                    // if (zoneScene == null) return;
-                    //
-                    // if (zoneScene.GetComponent<RoleInfosComponent>() == null ||
-                    //     zoneScene.GetComponent<RoleInfosComponent>().IsDisposed) return;
-                    //
-                    // var roleInfo = zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole();
-                    // if (roleInfo == null) return;
-                    //
-                    // if (GameGlobal.myNumericComponent == null) return;
-                    // int lvl = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
-                    //
-                    // if (zoneScene.GetComponent<ServerInfosComponent>() == null) return;
-                    // if (zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo == null) return;
-                    //
-                    // string serverName = zoneScene.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
-                    // QDDouYouManagerInit.Instance.ReportRole((int)reportType,
-                    //     roleInfo.Id.ToString(), lvl.ToString(), roleInfo.Name, roleInfo.ServerId.ToString(),
-                    //     serverName);
-                    break;
-                case (int)ChannelID.DouYouDev:
-                    //改名上报给sdk
-                    var zoneSceneDev = GameGlobal.zoneScene;
-                    if (zoneSceneDev == null) return;
-
-                    if (zoneSceneDev.GetComponent<RoleInfosComponent>() == null ||
-                        zoneSceneDev.GetComponent<RoleInfosComponent>().IsDisposed) return;
-
-                    var roleInfoDev = zoneSceneDev.GetComponent<RoleInfosComponent>().GetCurrentRole();
-                    if (roleInfoDev == null) return;
-
-                    if (GameGlobal.myNumericComponent == null) return;
-                    int lvlDev = GameGlobal.myNumericComponent.GetAsInt(NumericType.Lvl);
-
-                    if (zoneSceneDev.GetComponent<ServerInfosComponent>() == null) return;
-                    if (zoneSceneDev.GetComponent<ServerInfosComponent>().recentlyServerInfo == null) return;
-
-                    string serverNameDev =
-                        zoneSceneDev.GetComponent<ServerInfosComponent>().recentlyServerInfo.ServerName;
-                    QDDouYouManagerInit.Instance.ReportRole((int)reportType,
-                        roleInfoDev.Id.ToString(), lvlDev.ToString(), roleInfoDev.Name, roleInfoDev.ServerId.ToString(),
-                        serverNameDev);
-                    break;
-                case (int)ChannelID.AppStore:
-                    //TODO 接入douYou sdk 
-                    break;
                 default:
                     break;
             }
         }
-
+        
         public static bool IsTaptap
         {
-            get { return LauncherConfig.ChannelId == (int)ChannelID.TapTap; }
-        }
-
-        public static bool IsHYKB
-        {
-            get { return LauncherConfig.ChannelId == (int)ChannelID.HYKB; }
-        }
-
-        public static bool IsBiliBili
-        {
-            get { return LauncherConfig.ChannelId == (int)ChannelID.BiliBili; }
-        }
-
-        public static bool IsHuaWei
-        {
-            get { return LauncherConfig.ChannelId == (int)ChannelID.HUAWEI; }
+            get { return LauncherConfig.ChannelId == 101; }
         }
+        
     }
 }

+ 0 - 3
GameClient/Assets/Game/HotUpdate/Platform/ShareSDK.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: bc4adb18ebb44800a28c1150b6f3e9d4
-timeCreated: 1717839408

+ 0 - 124
GameClient/Assets/Game/HotUpdate/Platform/ShareSDK/QDShareManager.cs

@@ -1,124 +0,0 @@
-using System.Collections;
-using cn.sharesdk.unity3d;
-using GFGGame.Launcher;
-using UnityEngine;
-
-namespace GFGGame
-{
-    public class QDShareManager : SingletonBase<QDShareManager>
-    {
-        public void Init()
-        {
-            QDShareManagerInit.Instance.shareSDKListener = new ShareSDKListener();
-        }
-
-        //回传用户隐私授权结果
-
-        /// <summary>
-        /// 构造分享信息 SetShareType
-        /// </summary>
-        /// <param name="text">分享的文字</param>
-        /// <param name="imageUrl">iOS平台,本地以及网络图片都使用此方法</param>
-        /// <param name="imageUrlArr">分享一组图片</param>
-        /// <param name="title">分享的标题</param>
-        /// <param name="titleUrl">标题的网络链接(QQ和QQ空间使用 )</param>
-        /// <param name="site"></param>
-        /// <param name="siteUrl"></param>
-        /// <param name="url">分享的链接(微信,微博,易信,Facebook等平台)</param>
-        /// <param name="comment"></param>
-        /// <param name="musicUrl"></param>
-        /// <param name="shareType">分享类型(微信,易信) ContentType</param>
-        /// <returns></returns>
-        public ShareContent NewStructureShareContent(string text, string imageUrl, string[] imageUrlArr, string title,
-            string titleUrl,
-            string site,
-            string siteUrl,
-            string url,
-            string comment,
-            string musicUrl, int shareType)
-        {
-            ShareContent content = new ShareContent();
-            content.SetText(text);
-            content.SetImageUrl(imageUrl);
-            content.SetImageArray(imageUrlArr);
-            content.SetTitle(title);
-            content.SetTitleUrl(titleUrl);
-            content.SetSite(site);
-            content.SetSiteUrl(siteUrl);
-            content.SetUrl(url);
-            content.SetComment(comment);
-            content.SetMusicUrl(musicUrl);
-            content.SetShareType(shareType);
-            return content;
-        }
-
-        /// <summary>
-        /// 回传用户隐私授权结果给sdk
-        /// </summary>
-        /// <param name="granted"></param>
-        public void SubmitPolicyGrantResult(bool granted = true)
-        {
-            QDShareManagerInit.Instance.mobsdk.submitPolicyGrantResult(granted);
-        }
-
-        //通过分享菜单分享 
-        public int ShowPlatformList(PlatformType[] platforms, ShareContent shareContent)
-        {
-            return QDShareManagerInit.Instance.shareSDK.ShowPlatformList(platforms, shareContent, 100, 100);
-        }
-
-        //直接通过编辑界面分享
-        public int ShowShareContentEditor(PlatformType platformType, ShareContent shareContent)
-        {
-            return QDShareManagerInit.Instance.shareSDK.ShowShareContentEditor(platformType, shareContent);
-        }
-
-        //直接分享
-        public int ShareContent(PlatformType platformType, ShareContent shareContent)
-        {
-            return QDShareManagerInit.Instance.shareSDK.ShareContent(platformType, shareContent);
-        }
-    }
-
-    public class ShareSDKListener : IShareSDKListener
-    {
-        public void OnAuthResult(int reqID, ResponseState state, PlatformType type, Hashtable result)
-        {
-            Debug.Log($"OnAuthResult");
-        }
-
-        public void OnGetUserInfoResult(int reqID, ResponseState state, PlatformType type,
-            Hashtable result)
-        {
-            Debug.Log($"OnGetUserInfoResult");
-        }
-
-        public void OnShareResult(int reqID, ResponseState state, PlatformType type, Hashtable result)
-        {
-            if (state == ResponseState.Success)
-            {
-                ShareRecordSProxy.ReqShareRecord().Coroutine();
-            }
-
-            Debug.Log($"OnShareResult state:" + state);
-        }
-
-        public void OnGetFriendsResult(int reqID, ResponseState state, PlatformType type,
-            Hashtable result)
-        {
-            Debug.Log($"OnGetFriendsResult");
-        }
-
-        public void OnFollowFriendResult(int reqID, ResponseState state, PlatformType type,
-            Hashtable result)
-        {
-            Debug.Log($"OnFollowFriendResult");
-        }
-
-        public void OnIsClientValidForAndroidResult(int reqID, ResponseState state, PlatformType type,
-            Hashtable result)
-        {
-            Debug.Log($"OnFollowFriendResult");
-        }
-    }
-}

+ 0 - 3
GameClient/Assets/Game/HotUpdate/Platform/ShareSDK/QDShareManager.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: b74c0b4ef0234630ad3dcda87b3ef29a
-timeCreated: 1717839417

+ 1 - 1
GameClient/Assets/Game/HotUpdate/ServerProxy/AccountSProxy.cs

@@ -17,7 +17,7 @@ namespace GFGGame
             if (accountSession == null || accountSession.IsDisposed)
             {
                 notLogin = true;
-                accountSession = GameGlobal.zoneScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress));
+                accountSession = GameGlobal.zoneScene.GetComponent<NetWSComponent>().Create(NetworkHelper.ToIPEndPoint(GameConfig.LoginAddress));
             }
             try
             {

+ 0 - 1
GameClient/Assets/Game/HotUpdate/ServerProxy/CommonSProxy.cs

@@ -18,7 +18,6 @@ namespace ET
                     FunctionOpenDataManager.Instance.CheckHasLvFunOpen((int)message.NewValue,
                         oldValue); //等级变化要加测是否有功能开启
                     RoleDataManager.RoleLvUp(oldValue);
-                    QDManager.PushRoleAction(DouYouRoleLogReportType.LevelUp);
                     break;
                 case NumericType.Power:
                     RoleDataManager.powerTimeServerLock = false;

+ 0 - 1
GameClient/Assets/Game/HotUpdate/ServerProxy/RoleInfoSProxy.cs

@@ -136,7 +136,6 @@ namespace GFGGame
                 {
                     GameGlobal.zoneScene.GetComponent<RoleInfosComponent>().GetCurrentRole().Name = response.Name;
                     EventAgent.DispatchEvent(ConstMessage.CHANGE_ROLE_NAME);
-                    QDManager.PushRoleAction(DouYouRoleLogReportType.LevelUp);
                     return true;
                 }
             }

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -89,7 +89,7 @@ namespace GFGGame
             {
                 _ui.m_card.target.visible = false;
             }
-            // _ui.m_btnTask.target.visible = false;
+            _ui.m_btnTask.target.visible = false;
             UpdateEffect();
             UpdateRedDot();
             UpdateTime();
@@ -199,7 +199,7 @@ namespace GFGGame
         {
             RedDotController.Instance.SetComRedDot(_ui.m_btnLuckyBox.target
                 , RedDotDataManager.Instance.GetMeiRiTeHuiRed() || RedDotDataManager.Instance.GetActLuckyBoxRewardRed(ConstLimitTimeActivityType.ActLimitLuckyBox) 
-                || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -70, 45);
+                || RedDotDataManager.Instance.GetGiftBagRewardRed(), "", -36, 39);
             RedDotController.Instance.SetComRedDot(_ui.m_btnTask.target, RedDotDataManager.Instance.GetActLuckyBoxTaskdRed());
 
             int type = _activityCfg.type;
@@ -207,7 +207,7 @@ namespace GFGGame
             // 剧情战斗混合
             if(type == 1)
             {
-                RedDotController.Instance.SetComRedDot(_ui.m_btnChapter.target, RedDotDataManager.Instance.GetActLuckyBoxStudioFilingRed(),"",-60,60);
+                RedDotController.Instance.SetComRedDot(_ui.m_btnChapter.target, RedDotDataManager.Instance.GetActLuckyBoxStudioFilingRed());
             }
             else
             {

+ 0 - 5
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -142,11 +142,6 @@ namespace GFGGame
                     item.m_loaIcon.url = ResPathUtil.GetActivityPath("hd_xianshilc", "png");;
                     item.m_loaTitle.visible = false;
                 }
-                else if (openCfg.id == 510)
-                {
-                    item.m_loaIcon.url = ResPathUtil.GetActivityPath("gg_banner_lc_smcl_ad3", "png");;
-                    item.m_loaTitle.visible = false;
-                }
                 item.m_loaTitle.visible = false;
             }
             else if (openCfg.id == 501)

+ 0 - 6
GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -204,12 +204,6 @@ namespace GFGGame
             {
                 case (int)ChannelID.Test:
 
-                    break;
-                case (int)ChannelID.DouYou:
-                    // QDDouYouManager.Instance.LoginOutBefore();
-                    break;
-                case (int)ChannelID.DouYouDev:
-                    QDDouYouManager.Instance.LoginOutBefore();
                     break;
                 default:
                     break;

+ 6 - 6
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxWishView.cs

@@ -31,16 +31,16 @@ namespace GFGGame
             this.viewCom.Center();
             this.modal = true;
 
-            _ui.m_btnWish1.data = 1;
+            _ui.m_btnWish1.data = 0;
             _ui.m_btnWish1.onClick.Add(OnClickBtnWish);
-            _ui.m_btnWish2.data = 0;
+            _ui.m_btnWish2.data = 1;
             _ui.m_btnWish2.onClick.Add(OnClickBtnWish);
             _ui.m_btnRule.onClick.Add(RuleController.ShowRuleView);
             _ui.m_btnRule.data = 300024;
 
-            _ui.m_btnShow1.data = 1;
+            _ui.m_btnShow1.data = 0;
             _ui.m_btnShow1.onClick.Add(OnClickBtnShow);
-            _ui.m_btnShow2.data = 0;
+            _ui.m_btnShow2.data = 1;
             _ui.m_btnShow2.onClick.Add(OnClickBtnShow);
         }
         protected override void AddEventListener()
@@ -58,14 +58,14 @@ namespace GFGGame
             }
             else if(_actLimitTsy == 1)
             {
-                _ui.m_showType.selectedIndex = 3;
+                _ui.m_showType.selectedIndex = 2;
             }
             else
             {
                 _ui.m_showType.selectedIndex = 0;
             }
             
-            _ui.m_showType.selectedIndex = 3;
+            _ui.m_showType.selectedIndex = 0;
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);

+ 0 - 22
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -1697,28 +1697,6 @@ namespace GFGGame
 
             if (GuideDataManager.currentGuideId > 0) return;
             if (GameGlobal.AutoShowCompleted) return;
-            
-#if !GFGZSB
-            if (LauncherConfig.ChannelId != 101)
-            {
-                int isRegisterRoleInfo = GameGlobal.myNumericComponent.GetAsInt(NumericType.IsRegisterRoleInfo);
-                if (isRegisterRoleInfo == 0)
-                {
-                    ViewManager.Show<RoleInfoRegisterView>();
-                    return;
-                }
-            }
-
-            if (IsOutsideWorkingHours())
-            {
-                if (LauncherConfig.platformId == 1 && LauncherConfig.ChannelId == (int)ChannelID.DouYou)
-                {
-                    ViewManager.Show<QieHuanView>();
-                    return; 
-                }
-            }
-#endif
-            
             if (!GameGlobal.AfterDataInited) return;
             if (!ViewManager.CheckIsTopView(this.viewCom)) return;
             

+ 0 - 24
GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -1,7 +1,6 @@
 using FairyGUI;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using cn.sharesdk.unity3d;
 using UI.RoleInfo;
 using ET;
 
@@ -416,33 +415,10 @@ 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);
         }
 
         private void OnClickShareTest2(EventContext context = null)
         {
-            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.SetTitleUrl("http://www.mob.com");
-            content.SetSite("Mob-ShareSDK");
-            content.SetSiteUrl("http://www.mob.com");
-            content.SetUrl("http://www.mob.com");
-            content.SetComment("test description");
-            //content.SetMusicUrl("http://mp3.mwap8.com/destdir/Music/2009/20090601/ZuiXuanMinZuFeng20090601119.mp3");
-            content.SetShareType(ContentType.Image);
-            QDShareManager.Instance.ShowShareContentEditor(PlatformType.WeChat, content);
         }
 
         private void OnClickShareTest3(EventContext context = null)

+ 1 - 26
GameClient/Assets/Game/HotUpdate/Views/Share/ShareView.cs

@@ -1,13 +1,5 @@
-using ET;
-using FairyGUI;
-using System;
-using System.Collections;
-using System.Collections.Generic;
+using FairyGUI;
 using UnityEngine;
-using UnityEngine.EventSystems;
-using System.IO;
-using UnityEngine.Networking;
-using cn.sharesdk.unity3d;
 using UI.Share;
 
 namespace GFGGame
@@ -63,22 +55,18 @@ namespace GFGGame
         private void BtnOnclickShare()
         {
             ShareDataManager.Instance.CaptureCameraToImage(false);
-            ShareSDKFun(PlatformType.WeChatMoments);
         }
         private void BtnOnclickShareWb()
         {
             ShareDataManager.Instance.CaptureCameraToImage(false);
-            ShareSDKFun(PlatformType.SinaWeibo);
         }
         private void BtnOnClickShareWX()
         {
             ShareDataManager.Instance.CaptureCameraToImage(false);
-            ShareSDKFun(PlatformType.WeChat);
         }
         private void BtnOnClickShareQQ()
         {
             ShareDataManager.Instance.CaptureCameraToImage(false);
-            ShareSDKFun(PlatformType.QQ);
         }
         private void BtnOnClickShareQQPlatform()
         {
@@ -90,19 +78,6 @@ namespace GFGGame
         private void BtnOnClickShareDouYin()
         {
             ShareDataManager.Instance.CaptureCameraToImage(false);
-            ShareSDKFun(PlatformType.Douyin);
-        }
-        private void ShareSDKFun(PlatformType platformType)
-        {
-            QDShareManager.Instance.SubmitPolicyGrantResult();
-            ShareContent content = new ShareContent();
-            content.SetText("万世镜");
-            content.SetImagePath(ShareDataManager.Instance.outputImagePath);
-            content.SetTitle("wsj");
-            content.SetSite("Mob-ShareSDK");
-            content.SetComment("test description");
-            content.SetShareType(ContentType.Image);
-            QDShareManager.Instance.ShareContent(platformType, content);
         }
     }
 }

+ 3 - 3
GameClient/Assets/Game/HotUpdate/Views/Store/StorePayPropView.cs

@@ -79,8 +79,8 @@ namespace GFGGame
             string packageValue = "Sign=WXPay";
             string noncestr = response.NonceStr;
             string sign = response.Sign;
-            AliManagerr.Instance.PayVx(APP_ID, MCH_ID, prepayid, packageValue,
-                noncestr, response.Timestamp, sign);
+            // AliManagerr.Instance.PayVx(APP_ID, MCH_ID, prepayid, packageValue,
+            //     noncestr, response.Timestamp, sign);
         }
 
         private async void OnAliBtnBuyClick()
@@ -92,7 +92,7 @@ namespace GFGGame
                 return;
             }
 
-            AliManagerr.Instance.Pay(response.AliOrderStr);
+            // AliManagerr.Instance.Pay(response.AliOrderStr);
         }
 
         private async void OnCloseClick()

+ 9 - 62
GameClient/Assets/Game/Launcher/HotUpdateProxy/HotUpdateCodeLoader.cs

@@ -12,7 +12,6 @@ namespace GFGGame
 {
     public class HotUpdateCodeLoader : SingletonMonoBase<HotUpdateCodeLoader>
     {
-
         public static List<string> AOTMetaAssemblyNames { get; } = new List<string>()
         {
             "mscorlib.dll",
@@ -36,72 +35,20 @@ namespace GFGGame
 
         public void StartLoad()
         {
-
-#if !UNITY_EDITOR
-            StartCoroutine(StartLoadAssemblyHotfix());
-#else
-            var gameAss = AppDomain.CurrentDomain.GetAssemblies().First(assembly => assembly.GetName().Name == "Game.HotUpdate");
-            LoadAssemblyJustInTime(gameAss);
-#endif
-
+            Debug.Log("StartLoad - WebGL version (no hot update)");
+            StartCoroutine(LoadGameScene());
         }
 
-
-        IEnumerator StartLoadAssemblyHotfix()
+        IEnumerator LoadGameScene()
         {
-            yield return LoadMetadataForAOTAssemblies();
-            LogServerHelperHttp.SendNodeLog((int)LogNode.StartLoadGameDll);
-            //ET.Log.Debug("ILRuntimeLauncher StartLoadAssemblyHotfix");
-            yield return new WaitForSeconds(0.1f);
-            var dllPath = $"{LauncherConfig.DllDirHotfix}Game.HotUpdate.dll.bytes";
-            //var asset = GFGAsset.Load<TextAsset>(dllPath);
-            var handle = YooAssets.LoadAssetAsync<TextAsset>(dllPath);
-            yield return handle;
-            var asset = handle.AssetObject as TextAsset;
-            byte[] assBytes = asset.bytes;
-            var assembly = Assembly.Load(assBytes);
-            LoadAssemblyJustInTime(assembly);
-            //GFGAsset.Release(dllPath);
-            handle.Release();
-        }
+            // 这里可以添加一些加载前的准备工作
+            Debug.Log("Preparing to load game scene...");
 
-        void LoadAssemblyJustInTime(Assembly assembly)
-        {
-            //mono模式
-            this.allTypes = assembly.GetTypes();
-            //System.Type type = assembly.GetType("GFGGame.HotUpdate.HotUpdateEntry");
-            //var method = type.GetMethod("Start");
-            //var startDel = (Action)System.Delegate.CreateDelegate(typeof(Action), null, method);
-            //startDel();
-            YooAssets.LoadSceneAsync("Assets/ResIn/Scene/HotUpdate.unity");
-        }
-
-        /// <summary>
-        /// 为aot assembly加载原始metadata, 这个代码放aot或者热更新都行。
-        /// 一旦加载后,如果AOT泛型函数对应native实现不存在,则自动替换为解释模式执行
-        /// </summary>
-        IEnumerator LoadMetadataForAOTAssemblies()
-        {
-            // 可以加载任意aot assembly的对应的dll。但要求dll必须与unity build过程中生成的裁剪后的dll一致,而不能直接使用原始dll。
-            // 我们在BuildProcessors里添加了处理代码,这些裁剪后的dll在打包时自动被复制到 {项目目录}/HybridCLRData/AssembliesPostIl2CppStrip/{Target} 目录。
+            // 直接加载游戏场景
+            var sceneHandle = YooAssets.LoadSceneAsync("Assets/ResIn/Scene/HotUpdate.unity");
+            yield return sceneHandle;
 
-            /// 注意,补充元数据是给AOT dll补充元数据,而不是给热更新dll补充元数据。
-            /// 热更新dll不缺元数据,不需要补充,如果调用LoadMetadataForAOTAssembly会返回错误
-            /// 
-            HomologousImageMode mode = HomologousImageMode.SuperSet;
-            foreach (var aotDllName in AOTMetaAssemblyNames)
-            {
-                var dllPath = $"{LauncherConfig.DllDirAOT}{aotDllName}.bytes";
-                //var asset = GFGAsset.Load<TextAsset>(dllPath);
-                var handle = YooAssets.LoadAssetAsync<TextAsset>(dllPath);
-                yield return handle;
-                var asset = handle.AssetObject as TextAsset;
-                byte[] dllBytes = asset.bytes;
-                // 加载assembly对应的dll,会自动为它hook。一旦aot泛型函数的native函数不存在,用解释器版本代码
-                LoadImageErrorCode err = RuntimeApi.LoadMetadataForAOTAssembly(dllBytes, mode);
-                handle.Release();
-                //Debug.Log($"LoadMetadataForAOTAssembly:{aotDllName}. mode:{mode} ret:{err}");
-            }
+            Debug.Log("Game scene loaded successfully");
         }
     }
 }

+ 2 - 11
GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -73,7 +73,7 @@ namespace GFGGame
 
         public static void InitScriptCompilation()
         {
-            launcherRootUrl = "http://cdn.goufuguiwxw.com/";
+            launcherRootUrl = "https://cdn.goufuguiwxw.com/";
 #if PT_DEV
             //外网dev版本
             netType = EnumNetType.LOCAL;
@@ -104,7 +104,7 @@ namespace GFGGame
             ChannelId = (int)ChannelID.GFG;
 #else
             netType = EnumNetType.LOCAL;
-            cfgName = "cfg_local";
+            cfgName = "cfg_webgllocal";
             ChannelId = (int)ChannelID.Test;
 #endif
 
@@ -143,15 +143,6 @@ namespace GFGGame
                 LauncherConfig.douYouAdId = result.douYouAdId;
             }
 
-            if (!string.IsNullOrEmpty(result.isUseDouYouIos))
-            {
-                LauncherConfig.isUseDouYouIos = result.isUseDouYouIos;
-                if (LauncherConfig.isUseDouYouIos == "1")
-                {
-                    ChannelId = (int)ChannelID.DouYou;
-                }
-            }
-
             LauncherConfig.manifest_v = result.manifest_v;
             LauncherConfig.privacy_v = result.privacy_v;
             LauncherConfig.statusPrompt = result.statusPrompt;

+ 18 - 4
GameClient/Assets/Game/Launcher/LauncherController.cs

@@ -14,6 +14,7 @@ namespace GFGGame
         public static void InitLauncherCfg()
         {
             LauncherView.Instance.SetDesc("正在检查更新...");
+            Debug.Log($"正在检查更新...");
             var url = LauncherConfig.cfgUrl.Replace("{cfgName}", LauncherConfig.cfgName);
             url = url + "?t=" + DateTime.Now.Ticks;
             HttpTool.Instance.Get(url, (string json) =>
@@ -21,6 +22,7 @@ namespace GFGGame
                 LauncherConfig.InitPlatform(json);
                 //CheckShowAgreeView(CheckGameStatus);
                 CheckGameStatus();
+                Debug.Log($"正在检查更新...CheckGameStatus");
             });
         }
 
@@ -62,7 +64,8 @@ namespace GFGGame
         private static void InitSDK()
         {
             InitReporter();
-            InitBugly();
+            Debug.Log($"InitSDK...InitReporter");
+            //InitBugly();
             eventGroup.AddListener<LauncherEvent.InitPlatformResult>(OnInitPlatform);
             QDManagerInit.InitPlatform();
         }
@@ -70,18 +73,21 @@ namespace GFGGame
         private static void OnInitPlatform(IEventMessage obj)
         {
             LauncherEvent.InitPlatformResult initPlatformResult = obj as LauncherEvent.InitPlatformResult;
+            Debug.Log($"OnInitPlatform InitPlatformResult");
             if (initPlatformResult != null)
             {
                 if(initPlatformResult.success)
                 {
                     OnInitSDKSuccess();
+                    Debug.Log($"调试100");
                 }
                 else
                 {
                     OnInitSDKFail();
+                    Debug.Log($"调试101");
                 }
             }
-        }
+        } 
 
         private static void OnInitSDKFail()
         {
@@ -93,6 +99,7 @@ namespace GFGGame
         {
 #if UNITY_EDITOR
             InitResVersion();
+            Debug.Log($"OnInitSDKSuccess");
 #else
             CheckApkVersion();
 #endif
@@ -100,21 +107,26 @@ namespace GFGGame
 
         private static void CheckApkVersion()
         {
+            Debug.Log($"CheckApkVersion...apkVersion");
             var versionTarget = LauncherConfig.apkVersion;
             var version = Application.version;
             if (VersionUtil.compare(version, versionTarget))
             {
+                Debug.Log($"CheckApkVersion...UpdateApp");
                 QDManagerInit.UpdateApp();
+                Debug.Log($"CheckApkVersion UpdateApp");
             }
             else
             {
                 InitResVersion();
+                Debug.Log($"CheckApkVersion InitResVersion");
             }
         }
 
         private static void InitResVersion()
         {
             VersionController.Instance.Init();
+            Debug.Log($"调试InitResVersion");
         }
 
 
@@ -125,7 +137,9 @@ namespace GFGGame
 
         private static void StartGame()
         {
+            Debug.Log($"正在初始化0");
             LauncherView.Instance.SetDesc($"正在初始化...");
+            Debug.Log($"正在初始化1");
             HotUpdateCodeLoader.Instance.StartLoad();
         }
 
@@ -139,7 +153,7 @@ namespace GFGGame
         private static void InitBugly()
         {
 
-            BuglyAgent.ConfigDebugMode(true);
+            //BuglyAgent.ConfigDebugMode(true);
             // 注册日志回调,替换使用 'Application.RegisterLogCallback(Application.LogCallback)'注册日志回调的方式
             // BuglyAgent.RegisterLogCallback (CallbackDelegate.Instance.OnApplicationLogCallbackHandler);
 
@@ -156,7 +170,7 @@ namespace GFGGame
             }
 #endif
             // 如果你确认已在对应的iOS工程或Android工程中初始化SDK,那么在脚本中只需启动C#异常捕获上报功能即可
-            BuglyAgent.EnableExceptionHandler();
+            // BuglyAgent.EnableExceptionHandler();
 
         }
 

+ 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));
+//         }
+//
+//     }
+// }
+//

+ 43 - 43
GameClient/Assets/Game/Launcher/Platform/IDouYouSDKListener.cs

@@ -1,43 +1,43 @@
-namespace GFGGame.Launcher
-{
-    public interface IDouYouSDKListener
-    {
-        //public void ReceiveMessageAb(string message);
-
-        public void InitSuccessAb(string message);
-
-        public void LoginSuccessAb(string message);
-
-        public void OutLoginSuccessAb(string message);
-
-        public void PayFailAb(string message);
-
-        public void PaySuccessAb(string message);
-
-        public void SdkOnStartAb(string message);
-
-        public void SdkOnPauseAb(string message);
-
-        public void SdkOnResumeAb(string message);
-
-        public void SdkOnStopAb(string message);
-
-        public void SdkOnDestroyAb(string message);
-
-        public void SdkOnRestartAb(string message);
-
-        public void SdkOnBackPressedAb(string message);
-
-        public void SdkOnNewIntentAb(string message);
-
-        public void SdkOnConfigurationChangedAb(string message);
-
-        public void SdkOnSaveInstanceStateAb(string message);
-
-        public void SdkOnActivityResultAb(string message);
-
-        public void SdkOnRequestPermissionResultAb(string message);
-
-        public void SdkOnWindowFocusChangedAb(string message);
-    }
-}
+// namespace GFGGame.Launcher
+// {
+//     public interface IDouYouSDKListener
+//     {
+//         //public void ReceiveMessageAb(string message);
+//
+//         public void InitSuccessAb(string message);
+//
+//         public void LoginSuccessAb(string message);
+//
+//         public void OutLoginSuccessAb(string message);
+//
+//         public void PayFailAb(string message);
+//
+//         public void PaySuccessAb(string message);
+//
+//         public void SdkOnStartAb(string message);
+//
+//         public void SdkOnPauseAb(string message);
+//
+//         public void SdkOnResumeAb(string message);
+//
+//         public void SdkOnStopAb(string message);
+//
+//         public void SdkOnDestroyAb(string message);
+//
+//         public void SdkOnRestartAb(string message);
+//
+//         public void SdkOnBackPressedAb(string message);
+//
+//         public void SdkOnNewIntentAb(string message);
+//
+//         public void SdkOnConfigurationChangedAb(string message);
+//
+//         public void SdkOnSaveInstanceStateAb(string message);
+//
+//         public void SdkOnActivityResultAb(string message);
+//
+//         public void SdkOnRequestPermissionResultAb(string message);
+//
+//         public void SdkOnWindowFocusChangedAb(string message);
+//     }
+// }

+ 97 - 97
GameClient/Assets/Game/Launcher/Platform/Pay/AliPayManagerInit.cs

@@ -1,97 +1,97 @@
-using DouYouSdk;
-using UniFramework.Event;
-using UnityEngine;
-
-namespace GFGGame.Launcher
-{
-    public class AliPayManagerInit : SingletonBase<AliPayManagerInit>
-    {
-        public IAliSDKListener aliSDKListener;
-
-        private static AndroidJavaClass _unityPlayerClass;
-
-        private static AndroidJavaObject _mainActivity;
-
-        public void InitSDK()
-        {
-            if (_unityPlayerClass == null)
-            {
-                _unityPlayerClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
-            }
-
-            if (_mainActivity == null)
-            {
-                _mainActivity = _unityPlayerClass.GetStatic<AndroidJavaObject>("currentActivity");
-            }
-
-            AliDKHandler eventHandler = GameObject.Find("AliPayGameObject")?.GetComponent<AliDKHandler>();
-            if (eventHandler == null)
-            {
-                GameObject gameObject = new GameObject("AliPayGameObject");
-                gameObject.AddComponent<AliDKHandler>();
-                GameObject.DontDestroyOnLoad(gameObject);
-            }
-
-            InitVxSdk(LauncherConfig.vxSdkAppId);
-        }
-
-        /// <summary>
-        /// 调起支付宝支付
-        /// </summary>
-        public void ShowSwitchPayment(string orderStr, string callBackObjectName = "AliPayGameObject",
-            string callBackFuncName = "AliPayReceive")
-        {
-            Instance.CallDouYouMainActivity("AliPay", orderStr, callBackObjectName, callBackFuncName);
-        }
-
-        //实例化微信SDK
-        public void InitVxSdk(string appId)
-        {
-            Instance.CallDouYouMainActivity("WechatInit", appId);
-        }
-
-        /// <summary>
-        /// 调起微信支付
-        /// </summary>
-        /// <param name="appId">APP_ID:微信开放平台应用的唯一标识,通常由微信支付平台提供。</param>
-        /// <param name="mchId">MCH_ID:商户号,由微信支付平台提供。</param>
-        /// <param name="prepayId">prepayid:通过调用统一下单接口得到的预支付交易会话ID。是微信支付在后台创建订单时返回的参数。</param>
-        /// <param name="packageValue">packageValue:签名方式,通常为 "Sign=WXPay",如果需要做其他支付方式,可以修改这个值。</param>
-        /// <param name="nonceStr">这是一个随机字符串,用于防止请求被重放。</param>
-        /// <param name="timestamp">timestamp:时间戳,当前时间的秒级表示。这个值在每次请求时需要实时获取。</param>
-        /// <param name="sign">sign:签名,必须按照微信支付要求的方式来计算签名。签名的计算规则涉及到其他参数,需要商户自己计算。</param>
-        /// <param name="callBackObjectName"></param>
-        /// <param name="callBackFuncName"></param>
-        public void VxShowSwitchPayment(string appId, string mchId, string prepayId, string packageValue,
-            string nonceStr, string timestamp, string sign, string callBackObjectName = "AliPayGameObject",
-            string callBackFuncName = "VxPayReceive")
-        {
-            Instance.CallDouYouMainActivity("WeChatPayReq", appId, mchId, prepayId, packageValue,
-                nonceStr, timestamp, sign, callBackObjectName, callBackFuncName);
-        }
-
-        private void CallDouYouMainActivity(string functionName, params object[] args)
-        {
-            _mainActivity?.Call(functionName, args);
-        }
-
-        public class AliDKHandler : AliPaySDKHandler
-        {
-            /// <summary>
-            /// 支付回调
-            /// </summary>
-            /// <param name="message">支付回调</param>
-            public override void AliPayReceiveAb(string message)
-            {
-                Debug.Log($"AliPayReceiveAb:{message}");
-                AliPayManagerInit.Instance.aliSDKListener?.AliPayReceiveAb(message);
-            }
-
-            public override void VxPayReceiveAb(string message)
-            {
-                Debug.Log($"AliPayReceiveAb:{message}");
-                AliPayManagerInit.Instance.aliSDKListener?.VxPayReceiveAb(message);
-            }
-        }
-    }
-}
+// using DouYouSdk;
+// using UniFramework.Event;
+// using UnityEngine;
+//
+// namespace GFGGame.Launcher
+// {
+//     public class AliPayManagerInit : SingletonBase<AliPayManagerInit>
+//     {
+//         public IAliSDKListener aliSDKListener;
+//
+//         private static AndroidJavaClass _unityPlayerClass;
+//
+//         private static AndroidJavaObject _mainActivity;
+//
+//         public void InitSDK()
+//         {
+//             if (_unityPlayerClass == null)
+//             {
+//                 _unityPlayerClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
+//             }
+//
+//             if (_mainActivity == null)
+//             {
+//                 _mainActivity = _unityPlayerClass.GetStatic<AndroidJavaObject>("currentActivity");
+//             }
+//
+//             AliDKHandler eventHandler = GameObject.Find("AliPayGameObject")?.GetComponent<AliDKHandler>();
+//             if (eventHandler == null)
+//             {
+//                 GameObject gameObject = new GameObject("AliPayGameObject");
+//                 gameObject.AddComponent<AliDKHandler>();
+//                 GameObject.DontDestroyOnLoad(gameObject);
+//             }
+//
+//             InitVxSdk(LauncherConfig.vxSdkAppId);
+//         }
+//
+//         /// <summary>
+//         /// 调起支付宝支付
+//         /// </summary>
+//         public void ShowSwitchPayment(string orderStr, string callBackObjectName = "AliPayGameObject",
+//             string callBackFuncName = "AliPayReceive")
+//         {
+//             Instance.CallDouYouMainActivity("AliPay", orderStr, callBackObjectName, callBackFuncName);
+//         }
+//
+//         //实例化微信SDK
+//         public void InitVxSdk(string appId)
+//         {
+//             Instance.CallDouYouMainActivity("WechatInit", appId);
+//         }
+//
+//         /// <summary>
+//         /// 调起微信支付
+//         /// </summary>
+//         /// <param name="appId">APP_ID:微信开放平台应用的唯一标识,通常由微信支付平台提供。</param>
+//         /// <param name="mchId">MCH_ID:商户号,由微信支付平台提供。</param>
+//         /// <param name="prepayId">prepayid:通过调用统一下单接口得到的预支付交易会话ID。是微信支付在后台创建订单时返回的参数。</param>
+//         /// <param name="packageValue">packageValue:签名方式,通常为 "Sign=WXPay",如果需要做其他支付方式,可以修改这个值。</param>
+//         /// <param name="nonceStr">这是一个随机字符串,用于防止请求被重放。</param>
+//         /// <param name="timestamp">timestamp:时间戳,当前时间的秒级表示。这个值在每次请求时需要实时获取。</param>
+//         /// <param name="sign">sign:签名,必须按照微信支付要求的方式来计算签名。签名的计算规则涉及到其他参数,需要商户自己计算。</param>
+//         /// <param name="callBackObjectName"></param>
+//         /// <param name="callBackFuncName"></param>
+//         public void VxShowSwitchPayment(string appId, string mchId, string prepayId, string packageValue,
+//             string nonceStr, string timestamp, string sign, string callBackObjectName = "AliPayGameObject",
+//             string callBackFuncName = "VxPayReceive")
+//         {
+//             Instance.CallDouYouMainActivity("WeChatPayReq", appId, mchId, prepayId, packageValue,
+//                 nonceStr, timestamp, sign, callBackObjectName, callBackFuncName);
+//         }
+//
+//         private void CallDouYouMainActivity(string functionName, params object[] args)
+//         {
+//             _mainActivity?.Call(functionName, args);
+//         }
+//
+//         public class AliDKHandler : AliPaySDKHandler
+//         {
+//             /// <summary>
+//             /// 支付回调
+//             /// </summary>
+//             /// <param name="message">支付回调</param>
+//             public override void AliPayReceiveAb(string message)
+//             {
+//                 Debug.Log($"AliPayReceiveAb:{message}");
+//                 AliPayManagerInit.Instance.aliSDKListener?.AliPayReceiveAb(message);
+//             }
+//
+//             public override void VxPayReceiveAb(string message)
+//             {
+//                 Debug.Log($"AliPayReceiveAb:{message}");
+//                 AliPayManagerInit.Instance.aliSDKListener?.VxPayReceiveAb(message);
+//             }
+//         }
+//     }
+// }

+ 9 - 9
GameClient/Assets/Game/Launcher/Platform/Pay/IAliSDKListener.cs

@@ -1,9 +1,9 @@
-namespace GFGGame.Launcher
-{
-    public interface IAliSDKListener
-    {
-        public void AliPayReceiveAb(string message);
-
-        public void VxPayReceiveAb(string message);
-    }
-}
+// namespace GFGGame.Launcher
+// {
+//     public interface IAliSDKListener
+//     {
+//         public void AliPayReceiveAb(string message);
+//
+//         public void VxPayReceiveAb(string message);
+//     }
+// }

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

@@ -1,46 +1,46 @@
-using UnityEngine;
-using UniFramework.Event;
-
-namespace GFGGame.Launcher
-{
-
-    public static class QDAppStoreManagerInit
-    {
-        public static int AppTrackingAuthorizationStatus;
-        private const string ATTStatusLocalKey = "ATTStatusLocalKey";
-
-        public static void InitPlatform()
-        {
-#if !UNITY_EDITOR && UNITY_IOS
-            AppTrackingAuthorizationStatus = ATTAuth.GetAppTrackingAuthorizationStatus();
-            if (AppTrackingAuthorizationStatus == 0)
-            {
-                bool requested = LocalCache.GetBool(ATTStatusLocalKey, false);
-                if(!requested)
-                {
-                    AddIOSMethod();
-                    ATTAuth.RequestTrackingAuthorizationWithCompletionHandler((status) =>
-                    {
-                        Debug.Log("ATT status :" + status);
-                        AppTrackingAuthorizationStatus = status;
-                    });
-                }
-            }
-#endif
-            UniEvent.SendMessage(new LauncherEvent.InitPlatformResult() { success = true});
-        }
-
-
-        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>();
-        }
-    }
-}
+// using UnityEngine;
+// using UniFramework.Event;
+//
+// namespace GFGGame.Launcher
+// {
+//
+//     public static class QDAppStoreManagerInit
+//     {
+//         public static int AppTrackingAuthorizationStatus;
+//         private const string ATTStatusLocalKey = "ATTStatusLocalKey";
+//
+//         public static void InitPlatform()
+//         {
+// #if !UNITY_EDITOR && UNITY_IOS
+//             AppTrackingAuthorizationStatus = ATTAuth.GetAppTrackingAuthorizationStatus();
+//             if (AppTrackingAuthorizationStatus == 0)
+//             {
+//                 bool requested = LocalCache.GetBool(ATTStatusLocalKey, false);
+//                 if(!requested)
+//                 {
+//                     AddIOSMethod();
+//                     ATTAuth.RequestTrackingAuthorizationWithCompletionHandler((status) =>
+//                     {
+//                         Debug.Log("ATT status :" + status);
+//                         AppTrackingAuthorizationStatus = status;
+//                     });
+//                 }
+//             }
+// #endif
+//             UniEvent.SendMessage(new LauncherEvent.InitPlatformResult() { success = true});
+//         }
+//
+//
+//         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>();
+//         }
+//     }
+// }

+ 301 - 301
GameClient/Assets/Game/Launcher/Platform/QDDouYouManagerInit.cs

@@ -1,301 +1,301 @@
-using DouYouSdk;
-using UniFramework.Event;
-using UnityEngine;
-
-namespace GFGGame.Launcher
-{
-    public class QDDouYouManagerInit : SingletonBase<QDDouYouManagerInit>
-    {
-        public IDouYouSDKListener douYouSDKListener;
-
-        private static AndroidJavaClass _unityPlayerClass;
-
-        private static AndroidJavaObject _douYouMainActivity;
-
-        public void InitSDK(string adId)
-        {
-            if (_unityPlayerClass == null)
-            {
-                _unityPlayerClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
-            }
-
-            if (_douYouMainActivity == null)
-            {
-                _douYouMainActivity = _unityPlayerClass.GetStatic<AndroidJavaObject>("currentActivity");
-            }
-
-            DouYouSDKHandler eventHandler = GameObject.Find("DouYouSDKGameObject")?.GetComponent<DouYouSDKHandler>();
-            if (eventHandler == null)
-            {
-                GameObject gameObject = new GameObject("DouYouSDKGameObject");
-                gameObject.AddComponent<DouYouSDKHandler>();
-                GameObject.DontDestroyOnLoad(gameObject);
-            }
-
-            Instance.CallDouYouMainActivity("initDouYou", adId);
-        }
-
-        //调用桥接的 DouYouMainActivity.java 对象的方法
-        private void CallDouYouMainActivity(string functionName, params object[] args)
-        {
-            _douYouMainActivity?.Call(functionName, args);
-        }
-
-        /// <summary>
-        /// 显示登录界面
-        /// </summary>
-        public void ShowLogin()
-        {
-            Instance.CallDouYouMainActivity("extShowLogin");
-        }
-
-        /// <summary>
-        /// 角色登录数据上报
-        /// </summary>
-        /// <param name="id">角色ID</param>
-        /// <param name="level">角色等级</param>
-        /// <param name="nickname">角色名称</param>
-        /// <param name="sid">区服ID</param>
-        /// <param name="serverName">区服名称</param>
-        public void ReportRoleLogin(string id, string level, string nickname, string sid, string serverName)
-        {
-            Instance.CallDouYouMainActivity("extReportRoleLogin", id, level, nickname, sid, serverName);
-        }
-
-        /// <summary>
-        /// 角色数据上报
-        /// </summary>
-        /// <param name="logType">场景(1 - 进入游戏、2 - 创建角色、3 - 角色升级、4 - 退出、5 - 充值)</param>
-        /// <param name="id">角色ID</param>
-        /// <param name="level">角色等级</param>
-        /// <param name="nickname">角色名称</param>
-        /// <param name="sid">区服ID</param>
-        /// <param name="serverName">区服名称</param>
-        public void ReportRole(int logType, string id, string level, string nickname, string sid, string serverName)
-        {
-            Instance.CallDouYouMainActivity("extReportRole", logType, id, level, nickname, sid, serverName);
-        }
-
-        /// <summary>
-        /// 退出登录
-        /// </summary>
-        public void ShowLogout()
-        {
-            Instance.CallDouYouMainActivity("extShowLogout");
-        }
-
-        /// <summary>
-        /// 退出app
-        /// </summary>
-        public void ExitApp()
-        {
-            Instance.CallDouYouMainActivity("extExitApp");
-        }
-
-        /// <summary>
-        /// 调起支付
-        /// </summary>
-        /// <param name="orderId">订单号</param>
-        /// <param name="orderMoney">订单金额(元)</param>
-        /// <param name="productId">产品ID</param>
-        /// <param name="productName">产品名称</param>
-        /// <param name="productDesc">产品描述</param>
-        /// <param name="roleServiceId">区服ID</param>
-        /// <param name="serviceName">区服名称</param>
-        /// <param name="roleId">角色ID</param>
-        /// <param name="roleName">角色名称</param>
-        /// <param name="roleLevel">角色等级</param>
-        /// <param name="other">透传参数</param>
-        public void ShowSwitchPayment(string orderId, string orderMoney, string productId, string productName,
-            string productDesc, string roleServiceId, string serviceName, string roleId, string roleName,
-            string roleLevel, string other)
-        {
-            Instance.CallDouYouMainActivity("extShowSwitchPayment", orderId, orderMoney, productId, productName,
-                productDesc, roleServiceId, serviceName, roleId, roleName, roleLevel, other);
-        }
-
-        /// <summary>
-        /// cp激励广告订单id  登录后用户uid  角色id
-        /// </summary>
-        public void OpenGroMoreAD()
-        {
-            Instance.CallDouYouMainActivity("extOpenGroMoreAD");
-        }
-
-        public class DouYouSDKHandler : AbDouYouSDKHandler
-        {
-            /// <summary>
-            /// 测试消息
-            /// </summary>
-            /// <param name="message"></param>
-            public override void ReceiveMessageAb(string message)
-            {
-                Debug.Log($"ReceiveMessageAb:{message}");
-            }
-
-            /// <summary>
-            /// SDK实例化成功
-            /// </summary>
-            /// <param name="message">SDK 实例化成功</param>
-            public override void InitSuccessAb(string message)
-            {
-                UniEvent.SendMessage(new LauncherEvent.InitPlatformResult() { success = true });
-                QDDouYouManagerInit.Instance.douYouSDKListener?.InitSuccessAb(message);
-                Debug.Log($"InitSuccess:{message}");
-            }
-
-            /// <summary>
-            /// 登录成功 
-            /// </summary>
-            /// <param name="message">resUid + "|gfg|" + token</param>
-            public override void LoginSuccessAb(string message)
-            {
-                Debug.Log("LoginSuccessAb: " + message);
-                QDDouYouManagerInit.Instance.douYouSDKListener?.LoginSuccessAb(message);
-            }
-
-            /// <summary>
-            /// 切换账号或退出登录后
-            /// </summary>
-            /// <param name="message">退出登录成功!</param>
-            public override void OutLoginSuccessAb(string message)
-            {
-                Debug.Log("OutLoginSuccessAb: " + message);
-                QDDouYouManagerInit.Instance.douYouSDKListener?.OutLoginSuccessAb(message);
-            }
-
-            /// <summary>
-            /// 支付失败
-            /// </summary>
-            /// <param name="message">code + "|gfg|" + params.toString()</param>
-            public override void PayFailAb(string message)
-            {
-                Debug.Log("PayFailAb: " + message);
-                QDDouYouManagerInit.Instance.douYouSDKListener?.PayFailAb(message);
-            }
-
-            /// <summary>
-            /// 支付成功
-            /// </summary>
-            /// <param name="message">code + "|gfg|" + params.toString()</param>
-            public override void PaySuccessAb(string message)
-            {
-                Debug.Log("PaySuccessAb" + message);
-                QDDouYouManagerInit.Instance.douYouSDKListener?.PaySuccessAb(message);
-            }
-
-            #region SDK 生命周期函数
-
-            public override void SdkOnStartAb(string message)
-            {
-                Debug.Log($"SdkOnStartAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnStartAb(message);
-            }
-
-            public override void SdkOnPauseAb(string message)
-            {
-                Debug.Log($"SdkOnPauseAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnPauseAb(message);
-            }
-
-            public override void SdkOnResumeAb(string message)
-            {
-                Debug.Log($"SdkOnResumeAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnResumeAb(message);
-            }
-
-            public override void SdkOnStopAb(string message)
-            {
-                Debug.Log($"SdkOnStopAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnStopAb(message);
-            }
-
-            public override void SdkOnDestroyAb(string message)
-            {
-                Debug.Log($"SdkOnDestroyAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnDestroyAb(message);
-            }
-
-            public override void SdkOnRestartAb(string message)
-            {
-                Debug.Log($"SdkOnRestartAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnRestartAb(message);
-            }
-
-            public override void SdkOnBackPressedAb(string message)
-            {
-                Debug.Log($"SdkOnBackPressedAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnBackPressedAb(message);
-            }
-
-            public override void SdkOnNewIntentAb(string message)
-            {
-                Debug.Log($"SdkOnNewIntentAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnNewIntentAb(message);
-            }
-
-            public override void SdkOnConfigurationChangedAb(string message)
-            {
-                Debug.Log($"SdkOnConfigurationChangedAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnConfigurationChangedAb(message);
-            }
-
-            public override void SdkOnSaveInstanceStateAb(string message)
-            {
-                Debug.Log($"SdkOnSaveInstanceStateAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnSaveInstanceStateAb(message);
-            }
-
-            public override void SdkOnActivityResultAb(string message)
-            {
-                Debug.Log($"SdkOnActivityResultAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnActivityResultAb(message);
-            }
-
-            public override void SdkOnRequestPermissionResultAb(string message)
-            {
-                Debug.Log($"SdkOnRequestPermissionResultAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnRequestPermissionResultAb(message);
-            }
-
-            public override void SdkOnWindowFocusChangedAb(string message)
-            {
-                Debug.Log($"SdkOnWindowFocusChangedAb:{message}");
-                QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnWindowFocusChangedAb(message);
-            }
-
-            #endregion
-        }
-    }
-
-    /// <summary>
-    /// 场景(1 - 进入游戏、2 - 创建角色、3 - 角色升级、4 - 退出、5 - 充值)
-    /// </summary>
-    public enum DouYouRoleLogReportType
-    {
-        /// <summary>
-        /// 进入游戏
-        /// </summary>
-        EnterGame = 1,
-
-        /// <summary>
-        /// 创建角色
-        /// </summary>
-        CreateRole = 2,
-
-        /// <summary>
-        /// 角色升级
-        /// </summary>
-        LevelUp = 3,
-
-        /// <summary>
-        /// 退出
-        /// </summary>
-        ExitGame = 4,
-
-        /// <summary>
-        /// 充值
-        /// </summary>
-        Pay = 5
-    }
-}
+// using DouYouSdk;
+// using UniFramework.Event;
+// using UnityEngine;
+//
+// namespace GFGGame.Launcher
+// {
+//     public class QDDouYouManagerInit : SingletonBase<QDDouYouManagerInit>
+//     {
+//         public IDouYouSDKListener douYouSDKListener;
+//
+//         private static AndroidJavaClass _unityPlayerClass;
+//
+//         private static AndroidJavaObject _douYouMainActivity;
+//
+//         public void InitSDK(string adId)
+//         {
+//             if (_unityPlayerClass == null)
+//             {
+//                 _unityPlayerClass = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
+//             }
+//
+//             if (_douYouMainActivity == null)
+//             {
+//                 _douYouMainActivity = _unityPlayerClass.GetStatic<AndroidJavaObject>("currentActivity");
+//             }
+//
+//             DouYouSDKHandler eventHandler = GameObject.Find("DouYouSDKGameObject")?.GetComponent<DouYouSDKHandler>();
+//             if (eventHandler == null)
+//             {
+//                 GameObject gameObject = new GameObject("DouYouSDKGameObject");
+//                 gameObject.AddComponent<DouYouSDKHandler>();
+//                 GameObject.DontDestroyOnLoad(gameObject);
+//             }
+//
+//             Instance.CallDouYouMainActivity("initDouYou", adId);
+//         }
+//
+//         //调用桥接的 DouYouMainActivity.java 对象的方法
+//         private void CallDouYouMainActivity(string functionName, params object[] args)
+//         {
+//             _douYouMainActivity?.Call(functionName, args);
+//         }
+//
+//         /// <summary>
+//         /// 显示登录界面
+//         /// </summary>
+//         public void ShowLogin()
+//         {
+//             Instance.CallDouYouMainActivity("extShowLogin");
+//         }
+//
+//         /// <summary>
+//         /// 角色登录数据上报
+//         /// </summary>
+//         /// <param name="id">角色ID</param>
+//         /// <param name="level">角色等级</param>
+//         /// <param name="nickname">角色名称</param>
+//         /// <param name="sid">区服ID</param>
+//         /// <param name="serverName">区服名称</param>
+//         public void ReportRoleLogin(string id, string level, string nickname, string sid, string serverName)
+//         {
+//             Instance.CallDouYouMainActivity("extReportRoleLogin", id, level, nickname, sid, serverName);
+//         }
+//
+//         /// <summary>
+//         /// 角色数据上报
+//         /// </summary>
+//         /// <param name="logType">场景(1 - 进入游戏、2 - 创建角色、3 - 角色升级、4 - 退出、5 - 充值)</param>
+//         /// <param name="id">角色ID</param>
+//         /// <param name="level">角色等级</param>
+//         /// <param name="nickname">角色名称</param>
+//         /// <param name="sid">区服ID</param>
+//         /// <param name="serverName">区服名称</param>
+//         public void ReportRole(int logType, string id, string level, string nickname, string sid, string serverName)
+//         {
+//             Instance.CallDouYouMainActivity("extReportRole", logType, id, level, nickname, sid, serverName);
+//         }
+//
+//         /// <summary>
+//         /// 退出登录
+//         /// </summary>
+//         public void ShowLogout()
+//         {
+//             Instance.CallDouYouMainActivity("extShowLogout");
+//         }
+//
+//         /// <summary>
+//         /// 退出app
+//         /// </summary>
+//         public void ExitApp()
+//         {
+//             Instance.CallDouYouMainActivity("extExitApp");
+//         }
+//
+//         /// <summary>
+//         /// 调起支付
+//         /// </summary>
+//         /// <param name="orderId">订单号</param>
+//         /// <param name="orderMoney">订单金额(元)</param>
+//         /// <param name="productId">产品ID</param>
+//         /// <param name="productName">产品名称</param>
+//         /// <param name="productDesc">产品描述</param>
+//         /// <param name="roleServiceId">区服ID</param>
+//         /// <param name="serviceName">区服名称</param>
+//         /// <param name="roleId">角色ID</param>
+//         /// <param name="roleName">角色名称</param>
+//         /// <param name="roleLevel">角色等级</param>
+//         /// <param name="other">透传参数</param>
+//         public void ShowSwitchPayment(string orderId, string orderMoney, string productId, string productName,
+//             string productDesc, string roleServiceId, string serviceName, string roleId, string roleName,
+//             string roleLevel, string other)
+//         {
+//             Instance.CallDouYouMainActivity("extShowSwitchPayment", orderId, orderMoney, productId, productName,
+//                 productDesc, roleServiceId, serviceName, roleId, roleName, roleLevel, other);
+//         }
+//
+//         /// <summary>
+//         /// cp激励广告订单id  登录后用户uid  角色id
+//         /// </summary>
+//         public void OpenGroMoreAD()
+//         {
+//             Instance.CallDouYouMainActivity("extOpenGroMoreAD");
+//         }
+//
+//         public class DouYouSDKHandler : AbDouYouSDKHandler
+//         {
+//             /// <summary>
+//             /// 测试消息
+//             /// </summary>
+//             /// <param name="message"></param>
+//             public override void ReceiveMessageAb(string message)
+//             {
+//                 Debug.Log($"ReceiveMessageAb:{message}");
+//             }
+//
+//             /// <summary>
+//             /// SDK实例化成功
+//             /// </summary>
+//             /// <param name="message">SDK 实例化成功</param>
+//             public override void InitSuccessAb(string message)
+//             {
+//                 UniEvent.SendMessage(new LauncherEvent.InitPlatformResult() { success = true });
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.InitSuccessAb(message);
+//                 Debug.Log($"InitSuccess:{message}");
+//             }
+//
+//             /// <summary>
+//             /// 登录成功 
+//             /// </summary>
+//             /// <param name="message">resUid + "|gfg|" + token</param>
+//             public override void LoginSuccessAb(string message)
+//             {
+//                 Debug.Log("LoginSuccessAb: " + message);
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.LoginSuccessAb(message);
+//             }
+//
+//             /// <summary>
+//             /// 切换账号或退出登录后
+//             /// </summary>
+//             /// <param name="message">退出登录成功!</param>
+//             public override void OutLoginSuccessAb(string message)
+//             {
+//                 Debug.Log("OutLoginSuccessAb: " + message);
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.OutLoginSuccessAb(message);
+//             }
+//
+//             /// <summary>
+//             /// 支付失败
+//             /// </summary>
+//             /// <param name="message">code + "|gfg|" + params.toString()</param>
+//             public override void PayFailAb(string message)
+//             {
+//                 Debug.Log("PayFailAb: " + message);
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.PayFailAb(message);
+//             }
+//
+//             /// <summary>
+//             /// 支付成功
+//             /// </summary>
+//             /// <param name="message">code + "|gfg|" + params.toString()</param>
+//             public override void PaySuccessAb(string message)
+//             {
+//                 Debug.Log("PaySuccessAb" + message);
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.PaySuccessAb(message);
+//             }
+//
+//             #region SDK 生命周期函数
+//
+//             public override void SdkOnStartAb(string message)
+//             {
+//                 Debug.Log($"SdkOnStartAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnStartAb(message);
+//             }
+//
+//             public override void SdkOnPauseAb(string message)
+//             {
+//                 Debug.Log($"SdkOnPauseAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnPauseAb(message);
+//             }
+//
+//             public override void SdkOnResumeAb(string message)
+//             {
+//                 Debug.Log($"SdkOnResumeAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnResumeAb(message);
+//             }
+//
+//             public override void SdkOnStopAb(string message)
+//             {
+//                 Debug.Log($"SdkOnStopAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnStopAb(message);
+//             }
+//
+//             public override void SdkOnDestroyAb(string message)
+//             {
+//                 Debug.Log($"SdkOnDestroyAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnDestroyAb(message);
+//             }
+//
+//             public override void SdkOnRestartAb(string message)
+//             {
+//                 Debug.Log($"SdkOnRestartAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnRestartAb(message);
+//             }
+//
+//             public override void SdkOnBackPressedAb(string message)
+//             {
+//                 Debug.Log($"SdkOnBackPressedAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnBackPressedAb(message);
+//             }
+//
+//             public override void SdkOnNewIntentAb(string message)
+//             {
+//                 Debug.Log($"SdkOnNewIntentAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnNewIntentAb(message);
+//             }
+//
+//             public override void SdkOnConfigurationChangedAb(string message)
+//             {
+//                 Debug.Log($"SdkOnConfigurationChangedAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnConfigurationChangedAb(message);
+//             }
+//
+//             public override void SdkOnSaveInstanceStateAb(string message)
+//             {
+//                 Debug.Log($"SdkOnSaveInstanceStateAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnSaveInstanceStateAb(message);
+//             }
+//
+//             public override void SdkOnActivityResultAb(string message)
+//             {
+//                 Debug.Log($"SdkOnActivityResultAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnActivityResultAb(message);
+//             }
+//
+//             public override void SdkOnRequestPermissionResultAb(string message)
+//             {
+//                 Debug.Log($"SdkOnRequestPermissionResultAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnRequestPermissionResultAb(message);
+//             }
+//
+//             public override void SdkOnWindowFocusChangedAb(string message)
+//             {
+//                 Debug.Log($"SdkOnWindowFocusChangedAb:{message}");
+//                 QDDouYouManagerInit.Instance.douYouSDKListener?.SdkOnWindowFocusChangedAb(message);
+//             }
+//
+//             #endregion
+//         }
+//     }
+//
+//     /// <summary>
+//     /// 场景(1 - 进入游戏、2 - 创建角色、3 - 角色升级、4 - 退出、5 - 充值)
+//     /// </summary>
+//     public enum DouYouRoleLogReportType
+//     {
+//         /// <summary>
+//         /// 进入游戏
+//         /// </summary>
+//         EnterGame = 1,
+//
+//         /// <summary>
+//         /// 创建角色
+//         /// </summary>
+//         CreateRole = 2,
+//
+//         /// <summary>
+//         /// 角色升级
+//         /// </summary>
+//         LevelUp = 3,
+//
+//         /// <summary>
+//         /// 退出
+//         /// </summary>
+//         ExitGame = 4,
+//
+//         /// <summary>
+//         /// 充值
+//         /// </summary>
+//         Pay = 5
+//     }
+// }

+ 1 - 15
GameClient/Assets/Game/Launcher/Platform/QDManagerInit.cs

@@ -7,25 +7,11 @@ namespace GFGGame.Launcher
     {
         public static void InitPlatform()
         {
+            Debug.Log($"调试102");
             switch (LauncherConfig.ChannelId)
             {
-                case (int)ChannelID.DouYou:
-                    //QDDouYouManagerInit.Instance.InitSDK(LauncherConfig.douYouAdId);
-                    //QDShareManagerInit.Instance.InitSDK();
-                    UniEvent.SendMessage(new LauncherEvent.InitPlatformResult() { success = true });
-                    AliPayManagerInit.Instance.InitSDK();
-        
-                    break;
-                case (int)ChannelID.DouYouDev:
-                    QDDouYouManagerInit.Instance.InitSDK(LauncherConfig.douYouAdId);
-                    QDShareManagerInit.Instance.InitSDK();
-                    break;
-                case (int)ChannelID.AppStore:
-                    QDAppStoreManagerInit.InitPlatform();
-                    break;
                 default:
                     UniEvent.SendMessage(new LauncherEvent.InitPlatformResult() { success = true });
-                    QDShareManagerInit.Instance.InitSDK();
                     break;
             }
         }

+ 0 - 3
GameClient/Assets/Game/Launcher/Platform/ShareSDK.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: c9cb7c77ebd34ca590c681fdc3a6695d
-timeCreated: 1717838023

+ 0 - 24
GameClient/Assets/Game/Launcher/Platform/ShareSDK/IShareSDKListener.cs

@@ -1,24 +0,0 @@
-using System.Collections;
-using cn.sharesdk.unity3d;
-
-namespace GFGGame.Launcher
-{
-    public interface IShareSDKListener
-    {
-        public void OnAuthResult(int reqID, ResponseState state, PlatformType type, Hashtable result);
-
-        public void OnGetUserInfoResult(int reqID, ResponseState state, PlatformType type,
-            Hashtable result);
-
-        public void OnShareResult(int reqID, ResponseState state, PlatformType type, Hashtable result);
-
-        public void OnGetFriendsResult(int reqID, ResponseState state, PlatformType type,
-            Hashtable result);
-
-        public void OnFollowFriendResult(int reqID, ResponseState state, PlatformType type,
-            Hashtable result);
-
-        public void OnIsClientValidForAndroidResult(int reqID, ResponseState state, PlatformType type,
-            Hashtable result);
-    }
-}

+ 0 - 3
GameClient/Assets/Game/Launcher/Platform/ShareSDK/IShareSDKListener.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: f343722126ec4daf867c548368730e75
-timeCreated: 1717838042

+ 0 - 77
GameClient/Assets/Game/Launcher/Platform/ShareSDK/QDShareManagerInit.cs

@@ -1,77 +0,0 @@
-using System.Collections;
-using cn.sharesdk.unity3d;
-using UnityEngine;
-
-namespace GFGGame.Launcher
-{
-    public class QDShareManagerInit : SingletonBase<QDShareManagerInit>
-    {
-        public IShareSDKListener shareSDKListener;
-
-        public GameObject gameObject;
-
-        public MobSDK mobsdk;
-
-        public ShareSDK shareSDK;
-
-        public void InitSDK()
-        {
-            ShareSDKKHandler eventHandler = GameObject.Find("ShareSDKGameObject")
-                ?.GetComponent<ShareSDKKHandler>();
-            if (eventHandler == null)
-            {
-                gameObject = new GameObject("ShareSDKGameObject");
-                gameObject.AddComponent<ShareSDKKHandler>();
-                GameObject.DontDestroyOnLoad(gameObject);
-            }
-
-            GameObject mainCameraObject = GameObject.Find("GameLauncher");
-            mobsdk = mainCameraObject.GetComponent<MobSDK>();
-            shareSDK = mainCameraObject.GetComponent<ShareSDK>();
-        }
-
-        public class ShareSDKKHandler : AbShareSDKHandler
-        {
-            public override void OnAuthResult(int reqID, ResponseState state, PlatformType type, Hashtable result)
-            {
-                Debug.Log($"OnAuthResult xx");
-                QDShareManagerInit.Instance.shareSDKListener.OnAuthResult(reqID, state, type, result);
-            }
-
-            public override void OnGetUserInfoResult(int reqID, ResponseState state, PlatformType type,
-                Hashtable result)
-            {
-                Debug.Log($"OnGetUserInfoResult xx");
-                QDShareManagerInit.Instance.shareSDKListener.OnGetUserInfoResult(reqID, state, type, result);
-            }
-
-            public override void OnShareResult(int reqID, ResponseState state, PlatformType type, Hashtable result)
-            {
-                Debug.Log($"OnShareResult xx" + (int)type);
-                QDShareManagerInit.Instance.shareSDKListener.OnShareResult(reqID, state, type, result);
-            }
-
-            public override void OnGetFriendsResult(int reqID, ResponseState state, PlatformType type,
-                Hashtable result)
-            {
-                Debug.Log($"OnGetFriendsResult xx");
-                QDShareManagerInit.Instance.shareSDKListener.OnGetFriendsResult(reqID, state, type, result);
-            }
-
-            public override void OnFollowFriendResult(int reqID, ResponseState state, PlatformType type,
-                Hashtable result)
-            {
-                Debug.Log($"OnFollowFriendResult xx");
-                QDShareManagerInit.Instance.shareSDKListener.OnFollowFriendResult(reqID, state, type, result);
-            }
-
-            public override void OnIsClientValidForAndroidResult(int reqID, ResponseState state, PlatformType type,
-                Hashtable result)
-            {
-                Debug.Log($"OnIsClientValidForAndroidResult xx");
-                QDShareManagerInit.Instance.shareSDKListener
-                    .OnIsClientValidForAndroidResult(reqID, state, type, result);
-            }
-        }
-    }
-}

+ 0 - 3
GameClient/Assets/Game/Launcher/Platform/ShareSDK/QDShareManagerInit.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 0e3b50e6054444febfcae364a9bdd607
-timeCreated: 1717838161

+ 39 - 20
GameClient/Assets/Game/Launcher/Version/VersionController.cs

@@ -24,18 +24,28 @@ namespace GFGGame
 
         public IEnumerator InitVersion()
         {
+            Debug.Log("InitVersion started");
             yield return InitDefaultPackage();
-            if(string.IsNullOrEmpty(LauncherConfig.manifest_v))
+            Debug.Log("InitDefaultPackage completed");
+            if (string.IsNullOrEmpty(LauncherConfig.manifest_v))
             {
+                Debug.Log("Getting static version");
                 yield return GetStaticVersion(DefaultPackage);
+                Debug.Log("GetStaticVersion completed");
             }
             else
             {
+                Debug.Log("Using cached version");
                 VersionController.Instance.PackageVersion = LauncherConfig.manifest_v;
             }
+
+            Debug.Log("Updating manifest");
             yield return UpdateManifest(DefaultPackage);
+            Debug.Log("UpdateManifest completed");
 
+            Debug.Log("Creating downloader");
             CreateDownloader(DefaultPackage);
+            Debug.Log("InitVersion completed");
         }
 
         private IEnumerator InitDefaultPackage()
@@ -101,56 +111,60 @@ namespace GFGGame
         {
             bool savePackageVersion = true;
             var package = YooAssets.GetPackage(packageName);
-            var operation = package.UpdatePackageManifestAsync(VersionController.Instance.PackageVersion, savePackageVersion);
+            var operation =
+                package.UpdatePackageManifestAsync(VersionController.Instance.PackageVersion, savePackageVersion);
             yield return operation;
-
+            Debug.Log($"调试6");
             if (operation.Status != EOperationStatus.Succeed)
             {
                 Debug.LogWarning(operation.Error);
                 Alert.Show("更新版本信息失败,请检测网络链接后重试。")
-                        .SetLeftButton(true, "重试", (data) => { StartCoroutine(UpdateManifest(packageName)); });
+                    .SetLeftButton(true, "重试", (data) => { StartCoroutine(UpdateManifest(packageName)); });
             }
         }
 
         private void CreateDownloader(string packageName)
         {
+            Debug.Log($"调试1");
             int downloadingMaxNum = 10;
             int failedTryAgain = 3;
             ResourcePackage package = YooAssets.GetPackage(packageName);
             //ResourceDownloaderOperation downloaderOperation = package.CreateResourceDownloader(new string[] { "preload", "dynamic" }, downloadingMaxNum, failedTryAgain);
-            ResourceDownloaderOperation downloaderOperation = package.CreateResourceDownloader(new string[] { "preload" }, downloadingMaxNum, failedTryAgain);
-
+            ResourceDownloaderOperation downloaderOperation =
+                package.CreateResourceDownloader(new string[] { "preload" }, downloadingMaxNum, failedTryAgain);
+            Debug.Log($"调试2");
             if (downloaderOperation.TotalDownloadCount == 0)
             {
                 LauncherController.OnVersionCompleted();
+                Debug.Log($"调试3");
             }
             else
             {
                 //A total of 10 files were found that need to be downloaded
                 Debug.Log($"Found total {downloaderOperation.TotalDownloadCount} files that need download !");
-
+                Debug.Log($"调试4");
                 // 发现新更新文件后,挂起流程系统
                 // 注意:开发者需要在下载前检测磁盘空间不足
                 int totalDownloadCount = downloaderOperation.TotalDownloadCount;
                 long totalDownloadBytes = downloaderOperation.TotalDownloadBytes;
                 float sizeMB = totalDownloadBytes / 1048576f;
                 sizeMB = Mathf.Clamp(sizeMB, 0.1f, float.MaxValue);
-                if(sizeMB > LauncherConfig.promptSizeMB)
+                if (sizeMB > LauncherConfig.promptSizeMB)
                 {
                     string totalSizeMB = sizeMB.ToString("f1");
-                    if(string.IsNullOrEmpty(LauncherConfig.updateResPrompt))
+                    if (string.IsNullOrEmpty(LauncherConfig.updateResPrompt))
                     {
                         LauncherConfig.updateResPrompt = "游戏有新的内容,需要更新{0}MB大小的资源";
                     }
+
                     string message = string.Format(LauncherConfig.updateResPrompt, totalSizeMB);
                     Alert.Show(message)
-                        .SetLeftButton(true, "更新", (data) =>
-                        {
-                            StartCoroutine(BeginDownload(downloaderOperation, packageName));
-                        });
+                        .SetLeftButton(true, "更新",
+                            (data) => { StartCoroutine(BeginDownload(downloaderOperation, packageName)); });
                 }
                 else
                 {
+                    Debug.Log($"调试5");
                     StartCoroutine(BeginDownload(downloaderOperation, packageName));
                 }
             }
@@ -159,18 +173,21 @@ namespace GFGGame
         private IEnumerator BeginDownload(ResourceDownloaderOperation downloaderOperation, string packageName)
         {
             // 注册下载回调
-            downloaderOperation.OnDownloadErrorCallback = 
+            downloaderOperation.OnDownloadErrorCallback =
                 (fileName, error) =>
                 {
-                    Debug.LogError($"加载{fileName}失败 {error}");
+                    Debug.LogError($"" +
+                                   $"加载{fileName}失败 {error}");
                 };
+            Debug.Log($"调试6");
             downloaderOperation.OnDownloadProgressCallback =
                 (totalDownloadCount, currentDownloadCount, totalDownloadSizeBytes, currentDownloadSizeBytes) =>
                 {
                     string currentSizeMB = (currentDownloadSizeBytes / 1048576f).ToString("f1");
                     string totalSizeMB = (totalDownloadSizeBytes / 1048576f).ToString("f1");
                     var progress = (float)currentDownloadSizeBytes / totalDownloadSizeBytes;
-                    LauncherView.Instance.SetDesc($"正在下载资源,{currentDownloadCount}/{totalDownloadCount}", $"{currentSizeMB}MB/{totalSizeMB}MB", true);
+                    LauncherView.Instance.SetDesc($"正在下载资源,{currentDownloadCount}/{totalDownloadCount}",
+                        $"{currentSizeMB}MB/{totalSizeMB}MB", true);
                     LauncherView.Instance.SetProgress((int)(progress * 100));
                 };
             downloaderOperation.BeginDownload();
@@ -180,12 +197,11 @@ namespace GFGGame
             if (downloaderOperation.Status != EOperationStatus.Succeed)
             {
                 Alert.Show("下载失败!请检查网络状态后重试。")
-                    .SetLeftButton(true, "重试", (data) =>
-                    {
-                        StartCoroutine(BeginDownload(downloaderOperation, packageName));
-                    });
+                    .SetLeftButton(true, "重试",
+                        (data) => { StartCoroutine(BeginDownload(downloaderOperation, packageName)); });
                 yield break;
             }
+
             LauncherController.OnVersionCompleted();
         }
 
@@ -214,6 +230,7 @@ namespace GFGGame
 #endif
             return $"{LauncherConfig.CDN_ROOT}/{platform}/{packageName}/HostPlay";
         }
+
         /// <summary>
         /// 远端资源地址查询服务类
         /// </summary>
@@ -227,10 +244,12 @@ namespace GFGGame
                 _defaultHostServer = defaultHostServer;
                 _fallbackHostServer = fallbackHostServer;
             }
+
             string IRemoteServices.GetRemoteMainURL(string fileName)
             {
                 return $"{_defaultHostServer}/{fileName}";
             }
+
             string IRemoteServices.GetRemoteFallbackURL(string fileName)
             {
                 return $"{_fallbackHostServer}/{fileName}";

+ 21 - 2
GameClient/Assets/Game/Launcher/Views/HealthAdviceView.cs

@@ -1,3 +1,4 @@
+using System.Collections;
 using FairyGUI;
 using UI.Launcher;
 using UnityEngine;
@@ -13,9 +14,27 @@ namespace GFGGame
         /// </summary>
         public static void Open()
         {
-            var go = Resources.Load<GameObject>("UUI/Launcher/UIHealthAdvice");
-            _ui = GameObject.Instantiate(go);
+            // 启动异步加载协程
+            CoroutineHelper.Instance.StartCoroutine(LoadUIHealthAdviceAsync());
+        }
+        
+        private static IEnumerator LoadUIHealthAdviceAsync()
+        {
+            // 异步加载资源
+            ResourceRequest request = Resources.LoadAsync<GameObject>("UUI/Launcher/UIHealthAdvice");
+            yield return request; // 等待加载完成
 
+            // 检查是否加载成功
+            if (request.asset != null)
+            {
+                // 实例化加载的资源
+                GameObject go = request.asset as GameObject;
+                _ui = GameObject.Instantiate(go);
+            }
+            else
+            {
+                Debug.LogError("Failed to load UIHealthAdvice prefab.");
+            }
         }
 
         /// <summary>

+ 58 - 15
GameClient/Assets/Game/Launcher/Views/LauncherView.cs

@@ -1,4 +1,5 @@
-using FairyGUI;
+using System.Collections;
+using FairyGUI;
 using UI.Launcher;
 using UnityEngine;
 
@@ -7,6 +8,7 @@ namespace GFGGame
     public class LauncherView
     {
         private static LauncherView m_Instance = null;
+
         /// <summary>
         /// 单例
         /// </summary>
@@ -18,6 +20,7 @@ namespace GFGGame
                 {
                     m_Instance = new LauncherView();
                 }
+
                 return m_Instance;
             }
         }
@@ -28,20 +31,24 @@ namespace GFGGame
         private GameObject _gameObject1;
         private GoWrapper _wrapper1;
         private string[] resNames = { "11", "33" };
+
         /// <summary>
         /// 每1%耗时,单位秒
         /// </summary>
         private const float SPEED = 0.01f;
+
         /// <summary>
         /// 界面是否打开状态
         /// </summary>
         private bool isOpen = false;
+
         /// <summary>
         /// FairyGUI包名
         /// </summary>
         private string _packageName;
 
         #region private
+
         private void Dispose()
         {
             if (_gameObject != null)
@@ -51,6 +58,7 @@ namespace GFGGame
                 _wrapper.Dispose();
                 _wrapper = null;
             }
+
             if (_gameObject1 != null)
             {
                 GameObject.Destroy(_gameObject1);
@@ -58,10 +66,12 @@ namespace GFGGame
                 _wrapper1.Dispose();
                 _wrapper1 = null;
             }
+
             UIPackage.RemovePackage("UI/" + _packageName + "/" + _packageName);
             _ui.Dispose(true);
             _ui = null;
         }
+
         #endregion
 
         public LauncherView()
@@ -73,20 +83,48 @@ namespace GFGGame
             _ui.target.AddRelation(GRoot.inst, RelationType.Size);
             _ui.m_txtVersion.text = Application.version;
 
+            // 启动异步加载协程
+            CoroutineHelper.Instance.StartCoroutine(LoadResourcesAsync());
+        }
+
+        private IEnumerator LoadResourcesAsync()
+        {
             string resPath = "Effect/ui_login/Game_Open_jindut_T";
+            string resPath1 = "Effect/ui_login/Game_Open_jindut";
 
-            var prefab = Resources.Load<GameObject>(resPath);
-            _gameObject = GameObject.Instantiate(prefab);
-            _gameObject.transform.localScale = new Vector3(100, 100, 100);
-            _wrapper = new GoWrapper(_gameObject);
-            _ui.m_progressBar1.m_holderStar.SetNativeObject(_wrapper);
+            // 异步加载第一个资源
+            ResourceRequest request = Resources.LoadAsync<GameObject>(resPath);
+            yield return request;
 
-            string resPath1 = "Effect/ui_login/Game_Open_jindut";
-            var prefab1 = Resources.Load<GameObject>(resPath1);
-            _gameObject1 = GameObject.Instantiate(prefab1);
-            _gameObject1.transform.localScale = new Vector3(100, 100, 100);
-            _wrapper1 = new GoWrapper(_gameObject1);
-            _ui.m_progressBar1.m_bar1.m_holder.SetNativeObject(_wrapper1); 
+            if (request.asset != null)
+            {
+                var prefab = request.asset as GameObject;
+                _gameObject = GameObject.Instantiate(prefab);
+                _gameObject.transform.localScale = new Vector3(100, 100, 100);
+                _wrapper = new GoWrapper(_gameObject);
+                _ui.m_progressBar1.m_holderStar.SetNativeObject(_wrapper);
+            }
+            else
+            {
+                Debug.LogError("Failed to load resource: " + resPath);
+            }
+
+            // 异步加载第二个资源
+            ResourceRequest request1 = Resources.LoadAsync<GameObject>(resPath1);
+            yield return request1;
+
+            if (request1.asset != null)
+            {
+                var prefab1 = request1.asset as GameObject;
+                _gameObject1 = GameObject.Instantiate(prefab1);
+                _gameObject1.transform.localScale = new Vector3(100, 100, 100);
+                _wrapper1 = new GoWrapper(_gameObject1);
+                _ui.m_progressBar1.m_bar1.m_holder.SetNativeObject(_wrapper1);
+            }
+            else
+            {
+                Debug.LogError("Failed to load resource: " + resPath1);
+            }
 
             _ui.m_groupBar.visible = false;
         }
@@ -101,6 +139,7 @@ namespace GFGGame
             {
                 return;
             }
+
             _ui.m_txtVersion.text = version;
         }
 
@@ -114,8 +153,9 @@ namespace GFGGame
             {
                 return;
             }
+
             _ui.m_groupBar.visible = showBar;
-            string str = string.Format("{0}  {1}", desc, descRight);//  + descRight;
+            string str = string.Format("{0}  {1}", desc, descRight); //  + descRight;
             _ui.m_txtDescLeft.text = str;
             // _ui.m_txtDescLeft.text = desc ?? "";
             // _ui.m_txtDescRight.text = descRight ?? "";
@@ -132,6 +172,7 @@ namespace GFGGame
             {
                 return;
             }
+
             double oldValule;
             GTweener twener = GTween.GetTween(_ui.m_progressBar1, TweenPropType.Progress);
             if (twener != null)
@@ -142,6 +183,7 @@ namespace GFGGame
             {
                 oldValule = _ui.m_progressBar1.target.value;
             }
+
             if (progress < oldValule)
             {
                 _ui.m_progressBar1.target.value = progress;
@@ -153,7 +195,6 @@ namespace GFGGame
             }
             else
             {
-
                 float duration = (float)(progress - oldValule) * SPEED;
                 GTweener gtweener = _ui.m_progressBar1.target.TweenValue(progress, duration).OnUpdate((GTweener t) =>
                 {
@@ -178,6 +219,7 @@ namespace GFGGame
             {
                 return;
             }
+
             _ui.m_progressBar1.target.value = 0;
             _ui.m_txtDescLeft.text = "";
             _ui.m_txtDescRight.text = "";
@@ -195,6 +237,7 @@ namespace GFGGame
             {
                 return;
             }
+
             isOpen = false;
             _ui.target.RemoveFromParent();
             if (toDestroy)
@@ -203,4 +246,4 @@ namespace GFGGame
             }
         }
     }
-}
+}

+ 28 - 6
GameClient/Assets/Game/Launcher/Views/PadMaskView.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using System.Collections;
+using UnityEngine;
 using UnityEngine.UI;
 
 namespace GFGGame
@@ -14,10 +15,30 @@ namespace GFGGame
         /// </summary>
         public static void Open()
         {
-            var go = Resources.Load<GameObject>("UUI/Launcher/UIPadMask");
-            _ui = GameObject.Instantiate(go);
-            DontDestroyOnLoad(_ui);
+            CoroutineHelper.Instance.StartCoroutine(LoadPadMaskAsync());
+        }
+
+        /// <summary>
+        /// 异步加载 UIPadMask 资源
+        /// </summary>
+        private static IEnumerator LoadPadMaskAsync()
+        {
+            // 异步加载资源
+            var resourceRequest = Resources.LoadAsync<GameObject>("UUI/Launcher/UIPadMask");
+
+            // 等待资源加载完成
+            yield return new WaitUntil(() => resourceRequest.isDone);
 
+            // 在资源加载完成后实例化 UI
+            if (resourceRequest.asset != null)
+            {
+                _ui = GameObject.Instantiate(resourceRequest.asset as GameObject);
+                DontDestroyOnLoad(_ui);
+            }
+            else
+            {
+                Debug.LogError("Failed to load UIPadMask.");
+            }
         }
 
         /// <summary>
@@ -50,7 +71,8 @@ namespace GFGGame
             {
                 targetWidth = Screen.width;
             }
-            float leftX = - targetWidth / 2;
+
+            float leftX = -targetWidth / 2;
             float rightX = -leftX;
             float maskWidth = (Screen.width - targetWidth) / 2;
             BorderLeft.rectTransform.anchoredPosition = new Vector2(leftX, 0);
@@ -59,4 +81,4 @@ namespace GFGGame
             BorderRight.rectTransform.sizeDelta = BorderLeft.rectTransform.sizeDelta;
         }
     }
-}
+}

+ 1 - 1
GameClient/Assets/ThirdParty/Bugly/Plugins/BuglyPlugins/iOS/Bugly.framework/Headers.meta → GameClient/Assets/Plugins/HybridCLR.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2e39c573403bc479cb19650e7436097c
+guid: e1e14c0b84d19004ba25fcf90658c00f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 12 - 0
GameClient/Assets/ResIn/Fight/bg_fhl.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/Fight/fightBg.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/Fight/jingzhongh_bg.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/Fight/zd_bj_bja_1.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/Fight/zd_bj_bja_2.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/Fight/zd_bj_qg_1 1.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/Fight/zd_bj_qgqg_1.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/Fight/zd_bj_qgqg_2.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/Fight/zd_drpf_dzuo.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/Fight/zd_jsjm_bjtu.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_02.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_t.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/LoginRes/LoginSkin1/bg_top.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/Activity/Activity_atlas0!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/Activity/Activity_atlas0.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/Activity/Activity_atlas0_1!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/Activity/Activity_atlas0_1.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityAFuGift/ActivityAFuGift_atlas0.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_1.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 24 - 0
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2!a.png.meta

@@ -99,6 +99,30 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 24 - 0
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_2.png.meta

@@ -99,6 +99,30 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 24 - 0
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3!a.png.meta

@@ -99,6 +99,30 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 24 - 0
GameClient/Assets/ResIn/UI/ActivityAfternoonTea/ActivityAfternoonTea_atlas0_3.png.meta

@@ -99,6 +99,30 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityDay7/ActivityDay7_atlas0.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_1.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 24 - 0
GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_2!a.png.meta

@@ -99,6 +99,30 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 24 - 0
GameClient/Assets/ResIn/UI/ActivityGetYuanXiao/ActivityGetYuanXiao_atlas0_2.png.meta

@@ -99,6 +99,30 @@ TextureImporter:
     overridden: 1
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityGetYuanXiaoUI/ActivityGetYuanXiao_atlas0.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_2.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_3.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png


+ 12 - 0
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0!a.png.meta

@@ -111,6 +111,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

BIN
GameClient/Assets/ResIn/UI/ActivityMain/ActivityMain_atlas0.png


Vissa filer visades inte eftersom för många filer har ändrats