Эх сурвалжийг харах

Merge branch 'master' of http://10.108.64.190:3000/gfg/client

zhaoyang 2 жил өмнө
parent
commit
5c192b8020
100 өөрчлөгдсөн 324 нэмэгдсэн , 3174 устгасан
  1. 3 4
      FGUIProject/assets/BornLimit/FirstChargeBonusUI.xml
  2. 0 1
      FGUIProject/assets/BornLimit/package.xml
  3. BIN
      FGUIProject/assets/BornLimit/首充.png
  4. 3 0
      FGUIProject/assets/Main/MainUI.xml
  5. 5 0
      GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs
  6. 6 6
      GameClient/Assets/Game/HotUpdate/Constant/ConstSortingOrder.cs
  7. 2 2
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  8. 1 0
      GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs
  9. 14 2
      GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs
  10. 78 0
      GameClient/Assets/Game/HotUpdate/Data/ActivityGlobalDataManager.cs
  11. 3 0
      GameClient/Assets/Game/HotUpdate/Data/ActivityGlobalDataManager.cs.meta
  12. 1 1
      GameClient/Assets/Game/HotUpdate/Data/BattlePassTaskDataManager.cs
  13. 1 2
      GameClient/Assets/Game/HotUpdate/Data/CustomSuitDataManager.cs
  14. 1 1
      GameClient/Assets/Game/HotUpdate/Data/PhotographUtil.cs
  15. 27 11
      GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs
  16. 4 0
      GameClient/Assets/Game/HotUpdate/DressUp/MyDressUpHelper.cs
  17. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs
  18. 0 24
      GameClient/Assets/Game/HotUpdate/Platform/QDBiliBiliManager.cs
  19. 0 11
      GameClient/Assets/Game/HotUpdate/Platform/QDBiliBiliManager.cs.meta
  20. 0 154
      GameClient/Assets/Game/HotUpdate/Platform/QDHYKBManager.cs
  21. 0 11
      GameClient/Assets/Game/HotUpdate/Platform/QDHYKBManager.cs.meta
  22. 34 25
      GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs
  23. 0 173
      GameClient/Assets/Game/HotUpdate/Platform/QDTapTapManager.cs
  24. 0 11
      GameClient/Assets/Game/HotUpdate/Platform/QDTapTapManager.cs.meta
  25. 72 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityGlobalSProxy.cs
  26. 3 0
      GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityGlobalSProxy.cs.meta
  27. 2 3
      GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs
  28. 5 1
      GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs
  29. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs
  30. 35 3
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/FirstChargeBonusView.cs
  31. 4 69
      GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs
  32. 16 1
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  33. 0 8
      GameClient/Assets/Game/HotUpdate/com.meta
  34. 0 8
      GameClient/Assets/Game/HotUpdate/com/bilibili.meta
  35. 0 317
      GameClient/Assets/Game/HotUpdate/com/bilibili/GSCCallbackListerner.cs
  36. 0 11
      GameClient/Assets/Game/HotUpdate/com/bilibili/GSCCallbackListerner.cs.meta
  37. 0 346
      GameClient/Assets/Game/HotUpdate/com/bilibili/GSCSdkInterface.cs
  38. 0 11
      GameClient/Assets/Game/HotUpdate/com/bilibili/GSCSdkInterface.cs.meta
  39. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839.meta
  40. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk.meta
  41. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives.meta
  42. 0 58
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/HykbGameArchives.cs
  43. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/HykbGameArchives.cs.meta
  44. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/bean.meta
  45. 0 140
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/bean/GameArchivesDataBean.cs
  46. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/bean/GameArchivesDataBean.cs.meta
  47. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener.meta
  48. 0 53
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbLoadArchivesListener.cs
  49. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbLoadArchivesListener.cs.meta
  50. 0 50
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbReadArchivesListener.cs
  51. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbReadArchivesListener.cs.meta
  52. 0 48
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbSaveArchivesListener.cs
  53. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbSaveArchivesListener.cs.meta
  54. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs.meta
  55. 0 168
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/HykbAuxsSDK.cs
  56. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/HykbAuxsSDK.cs.meta
  57. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean.meta
  58. 0 77
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean/HykbActivationUiInfo.cs
  59. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean/HykbActivationUiInfo.cs.meta
  60. 0 79
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean/HykbGiftUiInfo.cs
  61. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean/HykbGiftUiInfo.cs.meta
  62. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener.meta
  63. 0 33
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxActivationCheckListener.cs
  64. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxActivationCheckListener.cs.meta
  65. 0 36
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxActivationListener.cs
  66. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxActivationListener.cs.meta
  67. 0 38
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxGiftListener.cs
  68. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxGiftListener.cs.meta
  69. 0 36
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxInitListener.cs
  70. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxInitListener.cs.meta
  71. 0 50
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxActivationListener.cs
  72. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxActivationListener.cs.meta
  73. 0 51
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxGiftListener.cs
  74. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxGiftListener.cs.meta
  75. 0 50
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxInitListener.cs
  76. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxInitListener.cs.meta
  77. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/common.meta
  78. 0 64
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/common/HykbContext.cs
  79. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/common/HykbContext.cs.meta
  80. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login.meta
  81. 0 124
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/HykbLogin.cs
  82. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/HykbLogin.cs.meta
  83. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/bean.meta
  84. 0 73
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/bean/HykbUser.cs
  85. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/bean/HykbUser.cs.meta
  86. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener.meta
  87. 0 31
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbAntiListener.cs
  88. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbAntiListener.cs.meta
  89. 0 82
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbInitListener.cs
  90. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbInitListener.cs.meta
  91. 0 46
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbLoginListener.cs
  92. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbLoginListener.cs.meta
  93. 0 68
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbUserListener.cs
  94. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbUserListener.cs.meta
  95. 0 51
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbV2InitListener.cs
  96. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbV2InitListener.cs.meta
  97. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/paid.meta
  98. 0 51
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/paid/HykbCheckListener.cs
  99. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/paid/HykbCheckListener.cs.meta
  100. 0 31
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/paid/HykbPaidChecker.cs

+ 3 - 4
FGUIProject/assets/BornLimit/FirstChargeBonusUI.xml

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1230">
-  <controller name="c1" pages="0,,1,,2," selected="2">
+  <controller name="c1" pages="0,,1,,2," selected="0">
     <remark page="0" value="充值"/>
     <remark page="1" value="领取"/>
     <remark page="2" value="已领取"/>
   </controller>
   <displayList>
-    <image id="n4_sjiz" name="n4" src="sjiz5" fileName="首充.png" xy="0,-263"/>
     <image id="n0_fqor" name="n0" src="sjiz3" fileName="images/sc_db.png" xy="0,-43"/>
     <image id="n8_sjiz" name="n8" src="sjiz4" fileName="images/sc_lihui_lnlx.png" xy="10,29"/>
     <image id="n6_sjiz" name="n6" src="sjiz0" fileName="images/sc_mc_db.png" xy="140,202"/>
     <image id="n9_sjiz" name="n9" src="sjiz2" fileName="images/wz_sc.png" xy="437,139"/>
     <image id="n13_idkd" name="n13" src="idkdtnc" fileName="imagesNew/xsqg_zsx.png" pkg="eg2y0ldp" xy="461,400"/>
-    <text id="n7_sjiz" name="txtName" xy="151,297" size="40,130" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fffdfc" leading="-6" autoSize="height" strokeColor="#d88f4e" text="岭南荔夏"/>
+    <text id="n7_sjiz" name="txtName" xy="151,297" size="40,135" font="ui://eg2y0ldpa0cftkz" fontSize="30" color="#fffdfc" leading="-6" autoSize="height" strokeColor="#d88f4e" text="岭南荔夏"/>
     <list id="n1_fqor" name="list" xy="493,414" size="402,476" layout="flow_hz" overflow="scroll" lineGap="14" colGap="14" defaultItem="ui://eg2y0ldp9jv6tls">
       <item/>
       <item/>
@@ -29,7 +28,7 @@
       <gearDisplay controller="c1" pages="0"/>
       <Button title="前往充值" icon="ui://eg2y0ldpqqhzk"/>
     </component>
-    <component id="n3_fqor" name="btnGet" src="idkdtna" fileName="components/BtnStyle004.xml" pkg="eg2y0ldp" xy="560,928" touchable="false" grayed="true">
+    <component id="n3_fqor" name="btnGet" src="idkdtna" fileName="components/BtnStyle004.xml" pkg="eg2y0ldp" xy="560,928">
       <gearDisplay controller="c1" pages="1,2"/>
       <gearLook controller="c1" pages="2" values="1,0,1,0" default="1,0,0,1"/>
       <Button title="领取奖励"/>

+ 0 - 1
FGUIProject/assets/BornLimit/package.xml

@@ -7,7 +7,6 @@
     <image id="sjiz2" name="wz_sc.png" path="/images/"/>
     <image id="sjiz3" name="sc_db.png" path="/images/"/>
     <image id="sjiz4" name="sc_lihui_lnlx.png" path="/images/"/>
-    <image id="sjiz5" name="首充.png" path="/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/BornLimit" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

BIN
FGUIProject/assets/BornLimit/首充.png


+ 3 - 0
FGUIProject/assets/Main/MainUI.xml

@@ -103,6 +103,9 @@
     <graph id="n71_mzf8" name="n71" xy="0,0" size="1080,1920" alpha="0" touchable="false" type="rect" lineSize="0">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
+    <component id="n79_g1yr" name="btnFirstRecharge" src="qik1tm1" fileName="components/BtnStyle000.xml" pkg="eg2y0ldp" xy="423,223">
+      <Button title="首充"/>
+    </component>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n71_mzf8" tween="true" startValue="0" endValue="1" duration="10" ease="Linear"/>

+ 5 - 0
GameClient/Assets/Game/HotUpdate/Constant/ConstMessage.cs

@@ -124,5 +124,10 @@ namespace GFGGame
         public const string CONTINUOUS_REBATE_GIFT = "CONTINUOUS_REBATE_GIFT";//领取连续返利礼包
         public const string CONTINUOUS_REBATE_GIFT_SHOP_BUY = "CONTINUOUS_REBATE_GIFT_SHOP_BUY";
         public const string ACTIVITY_LUCKY_BOX = "ACTIVITY_LUCKY_BOX";//通知限时抽奖活动剩余次数
+        
+        //通知活动移除
+        public const string ACTIVITY_REMOVE = "ACTIVITY_REMOVE";
+        //通知活动添加
+        public const string ACTIVITY_ADD = "ACTIVITY_ADD";
     }
 }

+ 6 - 6
GameClient/Assets/Game/HotUpdate/Constant/ConstSortingOrder.cs

@@ -2,11 +2,11 @@ namespace GFGGame
 {
     public class ConstSortingOrder
     {
-        public const int TOP = 99;
-        public const int Guide = 100;
-        public const int Modal = 101;
-        public const int Alert = 102;
-        public const int Debug = 103;
-        public const int Float = 104;
+        public const int TOP = 1099;
+        public const int Guide = 1100;
+        public const int Modal = 1101;
+        public const int Alert = 1102;
+        public const int Debug = 1103;
+        public const int Float = 1104;
     }
 }

+ 2 - 2
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -2,7 +2,6 @@ using FairyGUI;
 using UnityEngine;
 using ET;
 using static GFGGame.LauncherConfig;
-using TapTap.Bootstrap;
 
 namespace GFGGame
 {
@@ -95,7 +94,7 @@ namespace GFGGame
 
         public static async ETTask PreEnterGameAsync()
         {
-            QDTapTapManager.Instance.OnEnterGame();
+            QDManager.OnEnterGame();
             RoleDataHandler.StartUpdate();
 
             GFGUIPackage.AddPackage(ResPathUtil.GetUIPackagePath("CommonGame"));
@@ -256,6 +255,7 @@ namespace GFGGame
             EnduringGiftBoxSProxy.ReqGetAllGiftBagRebateStatus().Coroutine();
             ChatSProxy.ReqQueryChatMsg(ChatType.League).Coroutine();
             ChatSProxy.ReqQueryChatMsg(ChatType.LeagueQuestion).Coroutine();
+            ActivityGlobalSProxy.GetActivityInfo().Coroutine();
 
             int storageAutoPlay = StorageDataManager.Instance.GetStorageValue(ConstStorageId.STORAGE_AUTO_PLAY);
             FightDataManager.Instance.autoPlay = storageAutoPlay <= 0 ? false : true;

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

@@ -224,6 +224,7 @@ namespace GFGGame
             var roleInfosComponent = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>();
             var roleInfo = roleInfosComponent.RoleInfos[0];
             roleInfosComponent.CurrentRoleId = roleInfo.Id;
+            QDManager.OnCreateRole();
             await ReqEnterGame();
         }
 

+ 14 - 2
GameClient/Assets/Game/HotUpdate/Data/ActivityDataManager.cs

@@ -88,8 +88,20 @@ namespace GFGGame
         /// <value></value>
         public int firstChargeBonusStatus
         {
-            get { return _firstChargeBonusStatus; }
-            set { _firstChargeBonusStatus = value; }
+            get 
+            { 
+                var status = GameGlobal.myNumericComponent.GetAsInt(ET.NumericType.FirstRechargeBonusStatus);
+                if (status == ConstBonusStatus.GOT)
+                {
+                    return ConstBonusStatus.GOT;
+                }
+
+                if (GameGlobal.myNumericComponent.GetAsLong(ET.NumericType.RechargeTotal) > 0)
+                {
+                    return ConstBonusStatus.CAN_GET;
+                }
+                return ConstBonusStatus.CAN_NOT_GET;
+            }
         }
     }
 }

+ 78 - 0
GameClient/Assets/Game/HotUpdate/Data/ActivityGlobalDataManager.cs

@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using System.Linq;
+using ET;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class ActivityInfo
+    {
+        public int activityId;
+
+        public long startTime;
+
+        public long endTime;
+    }
+
+    public class ActivityGlobalDataManager : SingletonBase<ActivityGlobalDataManager>
+    {
+        private Dictionary<int, ActivityInfo> activityInfos = new Dictionary<int, ActivityInfo>();
+
+        private Dictionary<int, List<int>> activityInfosByType = new Dictionary<int, List<int>>();
+
+        //添加活动数据
+        public void AddActivityInfo(ActivityInfo activityInfo)
+        {
+            if (activityInfo == null) return;
+            if (activityInfos.ContainsKey(activityInfo.activityId)) return;
+            activityInfos.Add(activityInfo.activityId, activityInfo);
+            if (!activityInfosByType.ContainsKey(activityInfo.activityId))
+            {
+                activityInfosByType.Add(activityInfo.activityId, new List<int>());
+            }
+            activityInfosByType[activityInfo.activityId].Add(activityInfo.activityId);
+            //ACTIVITY_ADD
+            EventAgent.DispatchEvent(ConstMessage.ACTIVITY_ADD, activityInfo.activityId);
+            //TODO 判断下时间非法情况
+            Timers.inst.Add(activityInfo.endTime - TimeHelper.ServerNow(), 0, ClientRemoveActivityInfo,
+                activityInfo.activityId);
+        }
+
+        private static void ClientRemoveActivityInfo(object param)
+        {
+            var activityId = (int)param;
+            ActivityGlobalSProxy.ReqCloseActivity(activityId).Coroutine();
+        }
+
+        //RemoveActivityInfo
+        public void RemoveActivityInfo(int activityId)
+        {
+            if (!activityInfos.ContainsKey(activityId)) return;
+            activityInfos.Remove(activityId);
+            if (!activityInfosByType.ContainsKey(activityId)) return;
+            activityInfosByType.Remove(activityId);
+            //ACTIVITY_REMOVE
+            EventAgent.DispatchEvent(ConstMessage.ACTIVITY_REMOVE, activityId);
+        }
+
+        //获取活动数据
+        public ActivityInfo GetActivityInfo(int activityId)
+        {
+            if (!activityInfos.ContainsKey(activityId)) return null;
+            return activityInfos[activityId];
+        }
+
+        //获取活动数据根据类型
+        public List<int> GetActivityInfoIdsByType(int activityType)
+        {
+            return !activityInfosByType.ContainsKey(activityType) ? new List<int>() : activityInfosByType[activityType];
+        }
+
+        //获取活动数据根据类型
+        public List<ActivityInfo> GetActivityInfoByType(int activityType)
+        {
+            var activityInfoIds = GetActivityInfoIdsByType(activityType);
+            return activityInfoIds.Select(GetActivityInfo).Where(activityInfo => activityInfo != null).ToList();
+        }
+    }
+}

+ 3 - 0
GameClient/Assets/Game/HotUpdate/Data/ActivityGlobalDataManager.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6ffaecd67741449e8034482090b52e39
+timeCreated: 1685762521

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/BattlePassTaskDataManager.cs

@@ -4,7 +4,7 @@ using ET;
 
 namespace GFGGame
 {
-    public class BattlePassTaskDataManager : Singleton<BattlePassTaskDataManager>
+    public class BattlePassTaskDataManager : SingletonBase<BattlePassTaskDataManager>
     {
         //通行证赛季Id
         private int SeasonId;

+ 1 - 2
GameClient/Assets/Game/HotUpdate/Data/CustomSuitDataManager.cs

@@ -1,10 +1,9 @@
 using System.Collections.Generic;
-using System.Collections;
 using ET;
 
 namespace GFGGame
 {
-    public class CustomSuitDataManager : Singleton<CustomSuitDataManager>
+    public class CustomSuitDataManager : SingletonBase<CustomSuitDataManager>
     {
         private static int _currentIndex;
         public static int currentIndex { get; set; }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Data/PhotographUtil.cs

@@ -210,7 +210,7 @@ namespace GFGGame
                 string[] strs = tf.name.Split('_');
                 if (strs.Length > 1 && strs[1] == "eff")//子物体是特效
                 {
-                    DressUpUtil.SetParticleSortingOrder(tf.gameObject, changeLayer, true);
+                    DressUpUtil.SetRenderersOrder(tf.gameObject, changeLayer, true);
                 }
             }
             CubismRenderController[] cubismRenders = parentObj.GetComponentsInChildren<CubismRenderController>();

+ 27 - 11
GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs

@@ -186,7 +186,7 @@ namespace GFGGame
             //特效
             if (!string.IsNullOrEmpty(effRes))
             {
-                TryAddEffectObj(effRes, BODY_EFFECT_OBJ_NAME, parentObj, 0);
+                TryAddEffectObj(effRes, BODY_EFFECT_OBJ_NAME, parentObj, 0, false);
             }
         }
 
@@ -237,9 +237,10 @@ namespace GFGGame
             //这里需要先添加静态图,防止加载动画有延迟,出现光头
             GameObject spriteObj = AddSpriteObj(res, ext, spritObjName, parentObj, sortingOrder, needSetMask);
 
+            GameObject aniObj = null;
             if (showAni)
             {
-                var aniObj = AddAnimationObj(res, aniObjName, parentObj, sortingOrder);
+                aniObj = AddAnimationObj(res, aniObjName, parentObj, sortingOrder);
                 if (aniObj != null && spriteObj != null)
                 {
                     Timers.inst.Add(0.03f, 1, (obj) =>
@@ -269,7 +270,7 @@ namespace GFGGame
 
             aniObjName = string.Format(FORMAT_EFFECT_OBJ_NAME, itemCfg.subType, layerId);
             TryRemoveObj(parentObj, aniObjName);
-            TryAddEffectObj(res, aniObjName, parentObj, sortingOrder);
+            TryAddEffectObj(res, aniObjName, parentObj, sortingOrder, aniObj != null);
         }
 
         private static GameObject AddSpriteObj(string res, string ext, string objName, GameObject parentObj, int sortingOrder, bool needSetMask)
@@ -387,7 +388,7 @@ namespace GFGGame
             {
                 render.SortingOrder = sortingOrder;
             }
-            SetParticleSortingOrder(gameObj, sortingOrder);
+            SetRenderersOrder(gameObj, sortingOrder);
             return gameObj;
         }
 
@@ -423,9 +424,9 @@ namespace GFGGame
             return gameObj;
         }
 
-        private static void TryAddEffectObj(string res, string objName, GameObject parentObj, int sortingOrder)
+        private static void TryAddEffectObj(string res, string objName, GameObject parentObj, int sortingOrder, bool inAni)
         {
-            var resPath = ResPathUtil.GetDressUpEffectPath(res);
+            var resPath = ResPathUtil.GetDressUpEffectPath(res, inAni);
             if (!VEngine.Versions.Contains(resPath))
             {
                 return;
@@ -436,12 +437,11 @@ namespace GFGGame
             gameObj.transform.SetParent(parentObj.transform, false);
             gameObj.name = objName;
             var sortingGroup = gameObj.transform.GetComponent<SortingGroup>();
-            if (sortingGroup == null)
+            if (sortingGroup != null)
             {
-                sortingGroup = gameObj.AddComponent<SortingGroup>();
+                GameObject.Destroy(sortingGroup);
             }
-            sortingGroup.sortingOrder = sortingOrder + 1;//特效层默认高一个层级
-            //SetParticleSortingOrder(gameObj, sortingOrder + 1);//特效层默认高一个层级
+            SetRenderersOrder(gameObj, sortingOrder + 1);//特效层默认高一个层级
         }
 
         public static void LoadSpritePos(string res, out float tx, out float ty)
@@ -464,9 +464,25 @@ namespace GFGGame
             ty = 0;
         }
 
-        public static void SetParticleSortingOrder(GameObject gameObj, int sortingOrder, bool isAdd = false)
+        public static void SetRenderersOrder(GameObject gameObj, int sortingOrder, bool isAdd = false)
         {
+            var meshRenderers = gameObj.transform.GetComponentsInChildren<MeshRenderer>();
+            for (int i = 0; i < meshRenderers.Length; i++)
+            {
+                var renderer = meshRenderers[i].GetComponent<Renderer>();
+                if (renderer != null)
+                {
+                    if (isAdd)
+                    {
+                        renderer.sortingOrder = renderer.sortingOrder + sortingOrder;
+                    }
+                    else
+                    {
 
+                        renderer.sortingOrder = sortingOrder;
+                    }
+                }
+            }
             ParticleSystem[] particles = gameObj.transform.GetComponentsInChildren<ParticleSystem>();
             for (int i = 0; i < particles.Length; i++)
             {

+ 4 - 0
GameClient/Assets/Game/HotUpdate/DressUp/MyDressUpHelper.cs

@@ -64,6 +64,10 @@ namespace GFGGame
                 {
                     isShangYi = true;
                 }
+                if(itemCfg.subType == ConstDressUpItemType.NEI_DA && itemCfg.id != ConstItemID.DEFULT_NEI_DA)
+                {
+                    isShangYi = true;
+                }
                 if (itemCfg.subType == ConstDressUpItemType.XIA_ZHUANG && itemCfg.id != ConstItemID.DEFULT_XIA_ZHUANG)
                 {
                     isXiaZhuang = true;

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs

@@ -33,6 +33,7 @@ namespace UI.Main
         public GGroup m_grpRight;
         public GGroup m_grpMove;
         public GLoader m_loaGuidestudio;
+        public GButton m_btnFirstRecharge;
         public Transition m_t1;
         public Transition m_t2;
         public Transition m_t3;
@@ -110,6 +111,7 @@ namespace UI.Main
             m_grpRight = (GGroup)comp.GetChild("grpRight");
             m_grpMove = (GGroup)comp.GetChild("grpMove");
             m_loaGuidestudio = (GLoader)comp.GetChild("loaGuidestudio");
+            m_btnFirstRecharge = (GButton)comp.GetChild("btnFirstRecharge");
             m_t1 = comp.GetTransition("t1");
             m_t2 = comp.GetTransition("t2");
             m_t3 = comp.GetTransition("t3");
@@ -161,6 +163,7 @@ namespace UI.Main
             m_grpRight = null;
             m_grpMove = null;
             m_loaGuidestudio = null;
+            m_btnFirstRecharge = null;
             m_t1 = null;
             m_t2 = null;
             m_t3 = null;

+ 0 - 24
GameClient/Assets/Game/HotUpdate/Platform/QDBiliBiliManager.cs

@@ -1,24 +0,0 @@
-namespace GFGGame
-{
-    public class QDBiliBiliManager : SingletonBase<QDBiliBiliManager>
-    {
-
-        public void InitSDK()
-        {
-            string merchant_id = "1060";
-            string app_id = "8192";
-            string server_id = "7360";
-            string app_key = "3a54f1fbe34940fba256954dc9d66e3e";
-            string sandboxKey = "";//ios特有
-            GSCSdkInterface.init(merchant_id, app_id, server_id, app_key, sandboxKey);
-            //结果通过类GSCCallbackListerner中的回调触发
-        }
-
-        public void Login()
-        {
-            ViewManager.Show<ModalStatusView>("登录中...");
-            GSCSdkInterface.login();
-            //结果通过类GSCCallbackListerner中的回调触发
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/Platform/QDBiliBiliManager.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: eab76b05a7fe78047bee80c21e740505
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 154
GameClient/Assets/Game/HotUpdate/Platform/QDHYKBManager.cs

@@ -1,154 +0,0 @@
-using com.m3839.sdk;
-using com.m3839.sdk.login;
-using com.m3839.sdk.login.bean;
-using com.m3839.sdk.login.listener;
-using ET;
-
-namespace GFGGame
-{
-    public class QDHYKBManager : SingletonBase<QDHYKBManager>
-    {
-
-        public string UserId;
-
-        public void InitSDK()
-        {
-            // 游戏屏幕方向 (Game Screen Orientation)
-            int screenOrienation = HykbContext.SCREEN_PORTRAIT;
-            // 初始化回调监听(Init callback)
-            HykbLogin.SetUserListener(new HykbUserListenerProxy());
-            HykbLogin.SetAntiListener(new HykbAntiListenerProxy());
-            HykbInitListenerProxy proxy = new HykbInitListenerProxy();
-            HykbLogin.Init("25374", screenOrienation, proxy);
-        }
-
-        /// <summary>
-        /// 登录
-        /// </summary>
-        public void Login()
-        {
-            QDHYKBManager.Instance.UserId = null;
-            ViewManager.Show<ModalStatusView>("登录中...");
-            HykbUser user = HykbLogin.GetUser();
-            Log.Debug($"sdk manager Login {user == null}");
-            if (user != null)
-            {
-                EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, user.getUserId());
-            }
-            else
-            {
-                Log.Debug($"sdk Login");
-                HykbLogin.Login();
-            }
-        }
-
-        /// <summary>
-        /// 切换账号
-        /// </summary>
-        public void DoSwitchAccount()
-        {
-            HykbLogin.SwitchAccount();
-        }
-
-        /// <summary>
-        /// 获取用户信息
-        /// </summary>
-        public void GetUser()
-        {
-            // 获取当前用户信息(Get current User information)
-            HykbUser user = HykbLogin.GetUser();
-            if (user != null)
-            {
-                //ShowText.text = user.toString();
-            }
-
-        }
-
-        //回到登录界面,不退出账号
-        public void OnQuitToLoginView()
-        {
-            
-            
-        }
-
-        public void Logout()
-        {
-            // 登出 (Logout)
-            HykbLogin.Logout();
-        }
-    }
-
-
-    class HykbInitListenerProxy : HykbV2InitListener
-    {
-        public HykbInitListenerProxy()
-        {
-            
-        }
-
-        public override void OnSucceed()
-        {
-            Log.Debug("HykbInitListenerProxy OnSucceed");
-            EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_INITED, true);
-        }
-
-        public override void OnFailed(int code, string message)
-        {
-            Log.Debug("HykbInitListenerProxy OnFailed code: " + code + " - message:" + message);
-            EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_INITED, false);
-        }
-    }
-
-    /// <summary>
-    /// 用户信息相关的监听(登录和切换账号)
-    /// </summary>
-    class HykbUserListenerProxy : HykbUserListener
-    {
-
-        public HykbUserListenerProxy()
-        {
-            
-        }
-
-        public override void OnLoginFailed(int code, string message)
-        {
-            Log.Debug($"OnLoginFailed code: " + code + " - message:" + message);
-            if (code == 2003)
-            {
-                ViewManager.Hide<ModalStatusView>();
-                return;
-            }
-            EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, null);
-        }
-
-        public override void OnLoginSucceed(HykbUser user)
-        {
-            Log.Debug("OnLoginSucceed");
-            QDHYKBManager.Instance.UserId = user.getUserId();
-             EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, user.getUserId());
-        }
-
-        public override void OnSwitchUser(HykbUser user)
-        {
-            Log.Debug("OnSwitchUser");
-            //instance.ShowText.text = "" + user.getNick();
-        }
-    }
-
-    class HykbAntiListenerProxy : HykbAntiListener
-    {
-        public override void OnAnti(int code, string message)
-        {
-            Log.Debug($"OnAnti code {code} message {message}");
-            if(code == 100)
-            {
-                
-            }
-            else
-            {
-                HykbLogin.Logout();
-            }
-        }
-    }
-
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/Platform/QDHYKBManager.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 7dd86f82c164f7a40993ec47aa21815b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 34 - 25
GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs

@@ -10,35 +10,53 @@
             ViewManager.Show<ModalStatusView>("正在初始化...");
             switch (LauncherConfig.ChannelId)
             {
-                case ChannelID.TapTap:
-                    QDTapTapManager.Instance.InitSDK();
-                    break;
-                case ChannelID.HYKB:
-                    QDHYKBManager.Instance.InitSDK();
-                    break;
-                case ChannelID.BiliBili:
-                    QDBiliBiliManager.Instance.InitSDK();
-                    break;
                 default:
                     EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_INITED, true);
                     break;
             }
         }
 
-        //回到登录界面,不退出账号
-        public static void OnQuitToLoginView()
+        public static void Login()
         {
+            ViewManager.Show<ModalStatusView>("登录中...");
             switch (LauncherConfig.ChannelId)
             {
-                case ChannelID.TapTap:
-                    QDTapTapManager.Instance.OnQuitToLoginView();
+                default:
+                    bool login = GameController.CheckLoginCache(true);
+                    if (!login)
+                    {
+                        ViewManager.Hide<ModalStatusView>();
+                        ViewManager.Show<LoginInputView>();
+                    }
                     break;
-                case ChannelID.HYKB:
-                    QDHYKBManager.Instance.OnQuitToLoginView();
+            }
+        }
+
+        public static void OnCreateRole()
+        {
+            switch (LauncherConfig.ChannelId)
+            {
+                default:
+
                     break;
-                case ChannelID.BiliBili:
+            }
+        }
+
+        public static void OnEnterGame()
+        {
+            switch (LauncherConfig.ChannelId)
+            {
+                default:
 
                     break;
+            }
+        }
+
+        //回到登录界面,不退出账号
+        public static void OnQuitToLoginView()
+        {
+            switch (LauncherConfig.ChannelId)
+            {
                 default:
                     
                     break;
@@ -49,15 +67,6 @@
         {
             switch (LauncherConfig.ChannelId)
             {
-                case ChannelID.TapTap:
-                    QDTapTapManager.Instance.Logout();
-                    break;
-                case ChannelID.HYKB:
-                    QDHYKBManager.Instance.Logout();
-                    break;
-                case ChannelID.BiliBili:
-
-                    break;
                 default:
 
                     break;

+ 0 - 173
GameClient/Assets/Game/HotUpdate/Platform/QDTapTapManager.cs

@@ -1,173 +0,0 @@
-using ET;
-using TapTap.Bootstrap;
-using TapTap.Common;
-using TapTap.TapDB;
-using Plugins.AntiAddictionUIKit;
-using System;
-using System.Threading.Tasks;
-using UnityEngine;
-
-namespace GFGGame
-{
-    public class QDTapTapManager : SingletonBase<QDTapTapManager>
-    {
-        private readonly string ClientID = "K7bDyPGYlVx2AAtk6q";
-        public void InitSDK()
-        {
-            Log.Debug($"tap InitSDK");
-            if (!QDManager.IsTaptap)
-            {
-                return;
-            }
-
-            var config = new TapConfig.Builder()
-                .ClientID(ClientID)
-                .ClientToken("fjwWBtibB4Dj3UjyRQxK2tZ3f8fGNgg14tcRW38D")
-                .ServerURL("https://k7bdypgy.cloud.tds1.tapapis.cn")
-                .RegionType(RegionType.CN)
-                .TapDBConfig(true, "tap", null, true)
-                .ConfigBuilder();
-            TapBootstrap.Init(config);
-            EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_INITED, true);
-        }
-
-        public async Task Login()
-        {
-            Log.Debug($"tap login");
-            if (!QDManager.IsTaptap)
-            {
-                EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, null);
-                return;
-            }
-            ViewManager.Show<ModalStatusView>("登录中...");
-            TDSUser tdsUser = await TDSUser.GetCurrent();
-            if (null != tdsUser)
-{
-                EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, tdsUser.ObjectId);
-                InitAntiAddiction(tdsUser.ObjectId);
-                return;
-            }
-            try
-            {
-                tdsUser = await TDSUser.LoginWithTapTap();
-                Log.Debug($"tap login Success:{tdsUser}");
-                EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, tdsUser.ObjectId);
-                InitAntiAddiction(tdsUser.ObjectId);
-            }
-            catch (Exception e)
-            {
-                if (e is TapException tapError)
-                {
-                    if (tapError.code == (int)TapErrorCode.ERROR_CODE_BIND_CANCEL) // 取消登录
-                    {
-                        Log.Debug("登录取消");
-                        ViewManager.Hide<ModalStatusView>();
-                        return;
-                    }
-                    else
-                    {
-                        Log.Error($"Login Error:{tapError.code} message:{tapError.message}");
-                        PromptController.Instance.ShowFloatTextPrompt(tapError.message);
-                    }
-                }
-                else
-                {
-                    Log.Error($"Login Error:{e}");
-                    PromptController.Instance.ShowFloatTextPrompt("登录异常");
-                }
-                EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, null);
-            }
-        }
-
-        public void InitAntiAddiction(string objectId)
-        {
-            Log.Debug($"tap InitAntiAddiction objectId {objectId}");
-            ViewManager.Show<ModalStatusView>("登录中...");
-            string gameIdentifier = ClientID;
-            // 是否启用时长限制功能
-            bool useTimeLimit = true;
-            // 是否启用消费限制功能
-            bool usePaymentLimit = false;
-            // 是否显示切换账号按钮
-            bool showSwitchAccount = true;
-
-            AntiAddictionUIKit.Init(gameIdentifier, useTimeLimit, usePaymentLimit, showSwitchAccount,
-                (antiAddictionCallbackData) =>
-                {
-                    int code = antiAddictionCallbackData.code;
-                    MsgExtraParams extras = antiAddictionCallbackData.extras;
-                    Log.Debug($"tap antiAddictionCallbackData code {code} extras title \n{extras?.title} description \n{extras?.description}");
-                    ViewManager.Hide<ModalStatusView>();
-                    // 根据 code 不同提示玩家不同信息,详见下面的说明
-                    if (code == 500)
-                    {
-                        ET.Log.Debug("玩家登录后判断当前玩家可以进行游戏");
-                    }
-                    else if(code == 1030)
-                    {
-                        ET.Log.Debug("未成年玩家当前无法进行游戏");
-                    }
-                    else if (code == 1095)
-                    {
-                        ET.Log.Debug("未成年允许游戏弹窗");
-                    }
-                    else if (code == 1000)
-                    {
-                        ET.Log.Debug("退出账号");
-                    }
-                    else if (code == 9002)
-                    {
-                        ET.Log.Debug("实名过程中点击了关闭实名窗");
-                        AntiAddictionUIKit.Startup(true, objectId);
-                    }
-                    else if (code == 1001)
-                    {
-                        ET.Log.Debug("点击切换账号按钮(v1.0.2 新增)");
-                        GameController.QuitToLoginView(true);
-                    }
-                },
-                (exception) =>
-                {
-                    // 处理异常
-                    Log.Debug($"tap exception {exception.ToString()}");
-                }
-            );
-
-            AntiAddictionUIKit.Startup(true, objectId);
-        }
-
-        public void OnEnterGame()
-        {
-            Log.Debug($"tap OnEnterGame");
-            if (!QDManager.IsTaptap)
-            {
-                return;
-            }
-            // 开始计时
-            AntiAddictionUIKit.EnterGame();
-            var serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
-            var accountInfoComponent = GameGlobal.zoneScene.GetComponent<AccountInfoComponent>();
-            var roleInfosComponent = GameGlobal.zoneScene.GetComponent<RoleInfosComponent>();
-            var currentRole = roleInfosComponent.GetCurrentRole();
-            TapDB.SetUser(accountInfoComponent.Account);
-            TapDB.SetName(currentRole.Name);
-            TapDB.SetLevel(RoleDataManager.lvl);
-            TapDB.SetServer(serverInfosComponent.GetCurrentServerInfo().ServerName);
-            Log.Debug($"tap TapDB \nSetUser {accountInfoComponent.Account} \nSetName {currentRole.Name} \nSetLevel {RoleDataManager.lvl} \nSetServer {serverInfosComponent.GetCurrentServerInfo().ServerName}");
-        }
-
-        //回到登录界面,不退出账号
-        public void OnQuitToLoginView()
-        {
-            Log.Debug($"tap OnQuitGame");
-            TapDB.ClearUser(); 
-            AntiAddictionUIKit.LeaveGame();
-        }
-
-        public void Logout()
-        {
-            TDSUser.Logout();
-            AntiAddictionUIKit.Logout();
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/Platform/QDTapTapManager.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: dacaeb85b5a644f488c91b69ef7b69f2
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 72 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityGlobalSProxy.cs

@@ -0,0 +1,72 @@
+using ET;
+using GFGGame;
+
+namespace ET
+{
+    //S2C_NoticeActivityOpen
+    public class S2C_NoticeActivityOpenHandler : AMHandler<S2C_NoticeActivityOpen>
+    {
+        protected override async ETTask Run(Session session, S2C_NoticeActivityOpen message)
+        {
+            ActivityGlobalDataManager.Instance.AddActivityInfo(new ActivityInfo
+            {
+                activityId = message.ActivityId,
+                startTime = message.StartTime,
+                endTime = message.EndTime
+            });
+            await ETTask.CompletedTask;
+        }
+    }
+    
+    //S2C_NoticeActivityClose
+    public class S2C_NoticeActivityCloseHandler : AMHandler<S2C_NoticeActivityClose>
+    {
+        protected override async ETTask Run(Session session, S2C_NoticeActivityClose message)
+        {
+            ActivityGlobalDataManager.Instance.RemoveActivityInfo(message.ActivityId);
+            await ETTask.CompletedTask;
+        }
+    }
+}
+
+namespace GFGGame
+{
+    public class ActivityGlobalSProxy
+    {
+        public static async ETTask GetActivityInfo()
+        {
+            var c2SGetActivityList = new C2S_GetActivityList();
+            //获取活动数据,这里是一次性拉去所有活动数据,如果活动数据量大,可以分类型拉取
+            c2SGetActivityList.Type.Add(0);
+            var response = (S2C_GetActivityList)await MessageHelper.SendToServer(c2SGetActivityList);
+            if (!(response is { Error: ErrorCode.ERR_Success }))
+            {
+                Log.Error("GetActivityInfo error");
+                return;
+            }
+            response.ActivityList.ForEach(activityInfo =>
+            {
+                ActivityGlobalDataManager.Instance.AddActivityInfo(new ActivityInfo
+                {
+                    activityId = activityInfo.ActivityId,
+                    startTime = activityInfo.StartTime,
+                    endTime = activityInfo.EndTime
+                });
+            });
+        }
+
+        //C2S_CloseActivity
+        public static async ETTask<bool> ReqCloseActivity(int activityId)
+        {
+            var response =
+                (S2C_CloseActivity)await MessageHelper.SendToServer(new C2S_CloseActivity()
+                    { ActivityId = activityId });
+            if (!(response is { Error: ErrorCode.ERR_Success }))
+            {
+                Log.Error("ReqCloseActivity error");
+                return false;
+            }
+            return true;
+        }
+    }
+}

+ 3 - 0
GameClient/Assets/Game/HotUpdate/ServerProxy/ActivityGlobalSProxy.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: af8ba20371d34f6cb41a29aad5df7459
+timeCreated: 1685762716

+ 2 - 3
GameClient/Assets/Game/HotUpdate/ServerProxy/ActivitySProxy.cs

@@ -58,13 +58,12 @@ namespace GFGGame
         //领取首冲奖励
         public static async ETTask<bool> ReqFirstChargeBonusRewards()
         {
-            M2C_GetDailySinInBonus response = null;
-            response = (M2C_GetDailySinInBonus)await MessageHelper.SendToServer(new C2M_GetDailySinInBonus() { });
+            S2C_GetFirstRechargeBonus response = null;
+            response = (S2C_GetFirstRechargeBonus)await MessageHelper.SendToServer(new C2S_GetFirstRechargeBonus() { });
             if (response != null)
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ActivityDataManager.Instance.firstChargeBonusStatus = response.BonusStatus;
                     BonusController.TryShowBonusList(GlobalCfgArray.globalCfg.firstChargeBonusArr);
                     return true;
                 }

+ 5 - 1
GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs

@@ -111,8 +111,12 @@ namespace GFGGame
         {
             return $"{ANIMATION_DIR_PATH}/DressUp/{res}/{res}.{extName}";
         }
-        public static string GetDressUpEffectPath(string res, string extName = "prefab")
+        public static string GetDressUpEffectPath(string res, bool inAni = false, string extName = "prefab")
         {
+            if(inAni)
+            {
+                return $"{EFFECT_DIR_PATH}/DressUpAni/{res}/{res}.{extName}";
+            }
             return $"{EFFECT_DIR_PATH}/DressUp/{res}/{res}.{extName}";
         }
         public static string GetViewEffectPath(string uiName, string resName, string extName = "prefab")

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Common/Controller/LuckyBoxController.cs

@@ -38,7 +38,7 @@ namespace GFGGame
             if (_luckyBoxCfg.resArr.Length > 1 || _luckyBoxCfg.suitShowArr.Length > 1)
             {
                 Timers.inst.Remove(UpdateTime);
-                Timers.inst.Add(1, 0, UpdateTime);
+                //Timers.inst.Add(1, 0, UpdateTime);
             }
         }
 

+ 35 - 3
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/FirstChargeBonusView.cs

@@ -35,13 +35,34 @@ namespace GFGGame
 
             _ui.m_btnCharge.onClick.Add(OnBtnChargeClick);
             _ui.m_btnGet.onClick.Add(OnBtnGetClick);
+            _ui.m_btnClose.onClick.Add(closeEventHandler);
+        }
 
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.NUMERIC_CHANGE, OnNumericChange);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.NUMERIC_CHANGE, OnNumericChange);
         }
 
         protected override void OnShown()
         {
             base.OnShown();
-
+            _ui.m_list.numItems = GlobalCfgArray.globalCfg.firstChargeBonusArr.Length;
+            var itemInfo = GlobalCfgArray.globalCfg.firstChargeBonusArr[0];
+            var itemId = itemInfo[0];
+            var itemCfg = ItemCfgArray.Instance.GetCfg(itemId);
+            if(itemCfg.suitId > 0)
+            {
+                var suitCfg = SuitCfgArray.Instance.GetCfg(itemCfg.suitId);
+                _ui.m_txtName.text = suitCfg.name;
+            }
+            UpdateView();
         }
         protected override void OnHide()
         {
@@ -50,7 +71,7 @@ namespace GFGGame
         }
         private void OnBtnChargeClick()
         {
-
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_CHARGE, ConstStoreSubId.STORE_CHARGE });
         }
         private async void OnBtnGetClick()
         {
@@ -59,12 +80,23 @@ namespace GFGGame
             {
                 UpdateView();
             }
+        
         }
+
+        private void OnNumericChange(EventContext context)
+        {
+            var status = (int)context.data;
+            if (status == NumericType.FirstRechargeBonusStatus || status == NumericType.RechargeTotal)
+            {
+                UpdateView();
+            }
+        }
+
         private void UpdateView()
         {
-            _ui.m_list.numItems = GlobalCfgArray.globalCfg.firstChargeBonusArr.Length;
             _ui.m_c1.selectedIndex = ActivityDataManager.Instance.firstChargeBonusStatus;
         }
+
         private void ListItemRender(int index, GObject obj)
         {
             UI_ComItem item = UI_ComItem.Proxy(obj);

+ 4 - 69
GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -2,10 +2,6 @@ using UnityEngine;
 using FairyGUI;
 using UI.Login;
 using ET;
-using TapTap.Bootstrap;
-using System;
-using TapTap.Common;
-using System.Threading.Tasks;
 
 namespace GFGGame
 {
@@ -142,15 +138,8 @@ namespace GFGGame
                 QDManager.isInited = true;
                 _ui.m_btnTapLogin.visible = QDManager.IsTaptap;
                 _ui.m_btnStart.visible = !QDManager.IsTaptap;
-                if (QDManager.IsHYKB)
-                {
-                    Timers.inst.Add(1, 1, DelayToHYKBLogin);
-                }
-                else
-                {
-                    //尝试自动登录
-                    OnClickBtnStart();
-                }
+                //尝试自动登录
+                OnClickBtnStart();
             }
             else
             {
@@ -166,16 +155,7 @@ namespace GFGGame
             if (!string.IsNullOrEmpty(account))
             {
                 _ui.m_btnTapLogin.visible = false;
-                if (QDManager.IsHYKB)
-                {
-                    //好游快爆因为SDK的防沉迷会使游戏失去焦点,需要检测焦点
-                    focusCount = 0;
-                    Timers.inst.Add(1, 0, CheckHykbLoginServer);
-                }
-                else
-                {
-                    LoginController.LoginTest(account).Coroutine();
-                }
+                LoginController.LoginTest(account).Coroutine();
             }
             else
             {
@@ -185,32 +165,6 @@ namespace GFGGame
             }
         }
 
-        //start==================垃圾代码,处理好游快爆sdk防沉迷无回调的问题
-        private void DelayToHYKBLogin(object obj)
-        {
-            //尝试自动登录
-            OnClickBtnStart();
-        }
-
-        private int focusCount;
-        private void CheckHykbLoginServer(object obj)
-        {
-            if (Application.isFocused)
-            {
-                focusCount++;
-                if (focusCount >= 2)
-                {
-                    LoginController.LoginTest(QDHYKBManager.Instance.UserId).Coroutine();
-                    Timers.inst.Remove(CheckHykbLoginServer);
-                }
-            }
-            else
-            {
-                focusCount = 0;
-            }
-        }
-        //end==================垃圾代码,处理好游快爆sdk防沉迷无回调的问题
-
         private void OnLoginSuccess(EventContext context)
         {
             _ui.m_btnLogout.visible = true;
@@ -242,26 +196,7 @@ namespace GFGGame
             var serverInfosComponent = GameGlobal.zoneScene.GetComponent<ServerInfosComponent>();
             if (serverInfosComponent.ServerInfoList.Count <= 0)
             {
-                if (QDManager.IsTaptap)
-                {
-                    QDTapTapManager.Instance.Login();
-                }
-                else if (QDManager.IsHYKB)
-                {
-                    QDHYKBManager.Instance.Login();
-                }
-                else if (QDManager.IsBiliBili)
-                {
-                    QDBiliBiliManager.Instance.Login();
-                }
-                else
-                {
-                    bool login = GameController.CheckLoginCache(true);
-                    if (!login)
-                    {
-                        ViewManager.Show<LoginInputView>();
-                    }
-                }
+                QDManager.Login();
             }
             else
             {

+ 16 - 1
GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -149,6 +149,7 @@ namespace GFGGame
             _btnGongGao.onClick.Add(OnClickBtnGongGao);
             _btnRenWu.onClick.Add(OnClickBtnRenWu);
             _btnActivityDay7.onClick.Add(OnClickBtnDay7);
+            _ui.m_btnFirstRecharge.onClick.Add(OnClickBtnFirstRecharge);
             // _btnStudio.onClick.Add(OnClickBtnStudio);
             // _btnField.onClick.Add(OnClickBtnField);
             _btnBag.onClick.Add(OnClickBtnBag);
@@ -197,7 +198,7 @@ namespace GFGGame
             SceneController.UpdateMainScene(_sceneObject);
             UpdateRoleLvl();
             UpdateHead();
-
+            UpdateBtnFirstRecharge();
             _valueBarController.OnShown();
 
 
@@ -620,6 +621,11 @@ namespace GFGGame
             ViewManager.Show<ActivityDay7View>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
         }
         
+        private void OnClickBtnFirstRecharge()
+        {
+            ViewManager.Show<FirstChargeBonusView>();
+        }
+
         private void OnClickHeadBar()
         {
             ViewManager.Show(ViewName.ROLE_INFO_VIEW);
@@ -676,6 +682,15 @@ namespace GFGGame
                 UpdateRoleLvl();
                 CheckFunOpen();
             }
+            if((int)context.data == NumericType.FirstRechargeBonusStatus)
+            {
+                UpdateBtnFirstRecharge();
+            }
+        }
+
+        private void UpdateBtnFirstRecharge()
+        {
+            _ui.m_btnFirstRecharge.visible = ActivityDataManager.Instance.firstChargeBonusStatus != ConstBonusStatus.GOT;
         }
 
         private void UpdateRoleLvl()

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com.meta

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

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/bilibili.meta

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

+ 0 - 317
GameClient/Assets/Game/HotUpdate/com/bilibili/GSCCallbackListerner.cs

@@ -1,317 +0,0 @@
-using UnityEngine;
-using LitJson;
-using GFGGame;
-
-public class GSCCallbackListerner : MonoBehaviour {
-
-	public const int StatusCode_Success      = 10010;
-	
-	public const string CALLBACKTYPE_INIT = "init"; //初始化
-    public const string CALLBACKTYPE_PAY = "pay";  //支付
-    public const string CALLBACKTYPE_SDKTYPE = "sdkType"; //获取sdktype
-    public const string CALLBACKTYPE_CHANNELID = "channelId"; //获取渠道id
-    public const string CALLBACKTYPE_FINGERPRINT = "fingerprint"; //获取设备指纹
-    public const string CALLBACKTYPE_ISLOGIN = "isLogin";  //获取是否登录
-    public const string CALLBACKTYPE_LOGIN = "login";  //登录
-    public const string CALLBACKTYPE_LOGOUT = "logout";  //登出
-    public const string CALLBACKTYPE_GETUSERINFO = "getUserInfo";  //获取用户信息
-    public const string CALLBACKTYPE_ACCOUNTPROTECT = "accountProtect"; //账号保护
-    public const string CALLBACKTYPE_AGREEMENTWITHLICENCE = "agreementWithLicence"; //用户协议
-    public const string CALLBACKTYPE_AGREEMENTWITHPRIVACY = "agreementWithPrivacy"; //隐私政策
-    public const string CALLBACKTYPE_GEETESTVIEW = "geetestView"; //人机验证
-    public const string CALLBACKTYPE_ACCOUNTINVALID = "AccountInvalid"; //账号异常
-    public const string CALLBACKTYPE_ISREALNAMEAUTH = "isRealNameAuth"; //获取是否还没
-    public const string CALLBACKTYPE_EXIT = "exit"; //退出
-    public const string CALLBACKTYPE_QUIT = "quit"; //退出游戏杀死进程的那种
-	
-	public void OnGSCSdkCallback (string jsonstr)
-	{
-		Debug.Log("OnGSCSdkCallback message: jsonstr=" + jsonstr);
-		JsonData json = JsonMapper.ToObject (jsonstr);
-		string callbackType = (string)json ["callbackType"];
-		int code = (int)json ["code"];
-		JsonData data = json ["data"];
-		switch (callbackType) {
-		case CALLBACKTYPE_INIT:
-			OnInitCallback(code, (string)data);
-			break;
-		case CALLBACKTYPE_PAY:
-			OnPayCallback(code, (string)data);
-			break;
-		case CALLBACKTYPE_SDKTYPE:
-			OnSdkTypeCallback(code, (string)data);
-			break;
-		case CALLBACKTYPE_CHANNELID:
-			OnChannelIdCallback(code, (string)data);
-			break;
-		case CALLBACKTYPE_FINGERPRINT:
-			OnFingerPrintCallback(code, (string)data);
-			break;	
-		case CALLBACKTYPE_ISLOGIN:
-			OnIsLoginCallback(code, data);
-			break;	
-		case CALLBACKTYPE_ISREALNAMEAUTH:
-			OnIsRealNameAuthCallback(code, data);
-			break;	
-		case CALLBACKTYPE_LOGIN:
-			OnLoginCallback(code,(string)data);
-			break;
-		case CALLBACKTYPE_LOGOUT:
-			OnLogoutCallback(code, (string)data);
-			break;
-		case CALLBACKTYPE_GETUSERINFO:
-			OnGetUserInfoCallback(code,(string)data);
-			break;
-		case CALLBACKTYPE_ACCOUNTPROTECT:
-			OnAccountProtectCallback(code,(string)data);
-			break;	
-		case CALLBACKTYPE_AGREEMENTWITHLICENCE:
-			OnAgreementWithLicenceCallback(code,(string)data);
-			break;
-		case CALLBACKTYPE_AGREEMENTWITHPRIVACY:
-			OnAgreementWithPrivacyCallback(code,(string)data);
-			break;			
-		case CALLBACKTYPE_GEETESTVIEW:
-			OnGeetestViewCallback(code,(string)data);
-			break;
-		case CALLBACKTYPE_ACCOUNTINVALID:
-			OnAccountInvalidCallback(code, (string)data);
-			break;
-		case CALLBACKTYPE_EXIT:
-			OnExitCallback((string)data);
-			break;
-		case CALLBACKTYPE_QUIT:
-			OnQuitCallback ((string)data);
-			break;
-		default:
-			return;
-		}
-	}
-
-	//初始化回调
-	public virtual void OnInitCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnInitCallback1" + data);
-		if (code == StatusCode_Success) {
-			EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_INITED, true);
-        } else
-		{
-			EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_INITED, false);
-			GSCSdkInterface.showToast("OnInitCallbackError " + " code: " + code + " message: +" + data);
-		}
-	}
-
-	//支付回调
-	public void OnPayCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnPayCallback" + data);
-		if (code == StatusCode_Success) {
-			JsonData json = JsonMapper.ToObject (data);
-			string out_trade_no = (string)json["out_trade_no"];
-			string bs_trade_no = (string)json["bs_trade_no"];
-			GSCSdkInterface.showToast("OnPayCallbackSuccess " + " out_trade_no: " + out_trade_no + " bs_out_trade_no: " + bs_trade_no);
-		} else {
-			JsonData json = JsonMapper.ToObject (data);
-			string message = (string)json["message"];
-			string out_trade_no = (string)json["out_trade_no"];
-			GSCSdkInterface.showToast("OnPayCallbackError " + " code: " + code + "out_trade_no" + out_trade_no + " message: +" + message);
-		}
-	}
-
-	//获取sdk_type回调
-	public void OnSdkTypeCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnSdkTypeCallback" + data);
-		GSCSdkInterface.showToast("OnSdkTypeCallback " + " sdkType: " + data);
-	}
-
-	//获取渠道id回调
-	public void OnChannelIdCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnChannelIdCallback" + data);
-		GSCSdkInterface.showToast("OnChannelIdCallback " + " channelId: " + data);
-	}
-
-	//获取设备指纹信息回调
-	public void OnFingerPrintCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnFingerPrintCallback" + data);
-		GSCSdkInterface.showToast("OnFingerPrintCallback " + " fingerPrint: " + data);
-	}
-
-	//获取是否登录回调
-	public void OnIsLoginCallback (int code, JsonData data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnIsLoginCallback" + data);
-		if (code == StatusCode_Success) {
-			bool isLogin = (bool)data;
-			GSCSdkInterface.showToast("OnIsLoginCallbackSuccess " + " isLogin: " + isLogin);
-		} else {
-			string message = (string)data;
-			GSCSdkInterface.showToast("OnIsLoginCallbackError " + " code: " + code + " message: +" + message);
-		}
-	}
-	
-	//获取是否实名认证回调
-	public void OnIsRealNameAuthCallback (int code, JsonData data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnIsRealNameAuthCallback" + data);
-		if (code == StatusCode_Success) {
-			bool isRealName = (bool)data;
-			GSCSdkInterface.showToast("OnIsRealNameAuthCallback " + " isRealName: " + isRealName);
-		} else {
-			string message = (string)data;
-			GSCSdkInterface.showToast("OnIsRealNameAuthCallback " + " code: " + code + " message: +" + message);
-		}
-	}
-
-	//获取登录回调
-	public void OnLoginCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnLoginCallback" + data);
-		if (code == StatusCode_Success) {
-			JsonData json = JsonMapper.ToObject (data);
-			string username = (string)json["username"];
-			string access_token = (string)json["access_token"];
-			string uid = (string)json["uid"];
-			EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, uid);
-			//Demo.uid = int.Parse(uid);
-			//Demo.username = username;
-			GSCSdkInterface.showToast("OnLoginCallbackSuccess " + " uid: " + uid + " username: " + username + " access_token: " + access_token);
-		} else
-		{
-			EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, null);
-			GSCSdkInterface.showToast("OnLoginCallbackError " + " code: " + code + " message: +" + data);
-		}
-	}
-	
-	//获取登出回调
-	public void OnLogoutCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnLogoutCallback" + data);
-		if (code == StatusCode_Success) {
-			GSCSdkInterface.showToast("OnLogoutCallbackSuccess " + " logout: " + data);
-		} else {
-			GSCSdkInterface.showToast("OnLogoutCallbackError " + " code: " + code + " message: +" + data);
-		}
-	}
-	
-	//获取用户信息回调
-	public void OnGetUserInfoCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnGetUserInfoCallback" + data);
-		if (code == StatusCode_Success) {
-			JsonData json = JsonMapper.ToObject (data);
-			string username = (string)json["username"];
-			string lastLoginTime = (string)json["lastLoginTime"];
-			string avatar = (string)json["avatar"];
-			string s_avatar = (string)json["s_avatar"];
-			GSCSdkInterface.showToast("OnGetUserInfoCallbackSuccess " + " username: " + username + " lastLoginTime: " + lastLoginTime
-			                    + " avatar: " + avatar + " s_avatar:" + s_avatar);
-		} else {
-			GSCSdkInterface.showToast("OnGetUserInfoCallbackError " + " code: " + code + " message: +" + data);
-		}
-	}
-
-	//账号保护回调
-	public void OnAccountProtectCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnAccountProtectCallback" + data);
-		if (code == StatusCode_Success) {
-			JsonData json = JsonMapper.ToObject (data);
-			string result = (string)json["result"];
-			GSCSdkInterface.showToast("OnAccountProtectCallbackSuccess " + " result: " + result);
-		} else {
-			GSCSdkInterface.showToast("OnAccountProtectCallbackError " + " code: " + code + " message: +" + data);
-		}
-	}
-
-	//用户协议回调
-	public void OnAgreementWithLicenceCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnAgreementWithLicenceCallback" + data);
-		if (code == StatusCode_Success) {
-			GSCSdkInterface.showToast("OnAgreementWithLicenceCallbackSuccess " + " data: " + data);
-		} else {
-			GSCSdkInterface.showToast("OnAgreementWithLicenceCallbackError " + " code: " + code + " message: +" + data);
-		}
-	}
-
-	//隐私政策回调
-	public void OnAgreementWithPrivacyCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnAgreementWithPrivacyCallback" + data);
-		if (code == StatusCode_Success) {
-			GSCSdkInterface.showToast("OnAgreementWithPrivacyCallbackSuccess " + " data: " + data);
-		} else {
-			GSCSdkInterface.showToast("OnAgreementWithPrivacyCallbackError " + " code: " + code + " message: +" + data);
-		}
-	}
-
-	//人机验证回调
-	public void OnGeetestViewCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnGeetestViewCallback" + data);
-		if (code == StatusCode_Success) {
-			JsonData json = JsonMapper.ToObject (data);
-			string captcha_type = (string)json["captcha_type"];
-			string image_token = (string)json["image_token"];
-			string captcha_code = (string)json["captcha_code"];
-			string challenge = (string)json["challenge"];
-			string validate = (string)json["validate"];
-			string seccode = (string)json["seccode"];
-			string gt_user_id = (string)json["gt_user_id"];
-			GSCSdkInterface.showToast("OnGeetestViewCallbackSuccess " + " captcha_type: " + captcha_type + " image_token: " + image_token + " captcha_code " + captcha_code + " challenge: " + challenge + " validate: " + validate + " seccode " + seccode + " gt_user_id " + gt_user_id);
-		} else {
-			GSCSdkInterface.showToast("OnGeetestViewCallbackError " + " code: " + code + " message: +" + data);
-		}
-	}
-
-	//账号异常回调
-	public void OnAccountInvalidCallback (int code, string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnAccountInvalidCallback" + data);
-		if (code == StatusCode_Success) {
-			//Demo.uid = 0;
-			//TODO
-			//游戏登出逻辑
-			GSCSdkInterface.showToast("OnAccountInvalidCallbackSuccess " + data);
-		} 
-	}
-
-	//退出回调
-	public virtual void OnExitCallback (string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnExitCallback," + data);
-		GSCSdkInterface.showToast(data);
-			//下面的用于demo,请改成自己的代码 
-		Application.Quit();
-
-	}
-
-	//退出游戏回调(防沉迷,付费之类)
-	public void OnQuitCallback(string data)
-	{
-		//下面的用于demo,请改成自己的代码 
-		Debug.Log("OnQuitCallback" + data);
-		GSCSdkInterface.showToast("OnQuitCallback - message: +" + data);
-		//下面的用于demo,请改成自己的代码 
-		Application.Quit();
-	}
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/bilibili/GSCCallbackListerner.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f5493ffac3e7e4392b0533cb8b515b81
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 346
GameClient/Assets/Game/HotUpdate/com/bilibili/GSCSdkInterface.cs

@@ -1,346 +0,0 @@
-using UnityEngine;
-using System.Collections;
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-using System.Security.Cryptography;
-
-/// <summary>
-/// 接收 SDK 的回调消息,进行处理。
-/// 该脚本应关联到每一个场景的 "Main Camera" 对象,以能接收SDK回调的消息。
-/// 下面各方法中的逻辑处理,在游戏中应修改为真实的逻辑。
-/// </summary>
-public class GSCSdkInterface : MonoBehaviour
-{
-
-	//iOS unity调用iOS层方法
-	[DllImport("__Internal")]
-	public static extern void __initIosSDK(string gameId, string cpId, string serverId, string appkey, string sandboxKey);
-
-	[DllImport("__Internal")]
-	public static extern void __iosLogin();
-
-	[DllImport("__Internal")]
-	public static extern void __iosLogout();
-
-	[DllImport("__Internal")]
-	public static extern void __iosUserInfo(string accesskey);
-
-	[DllImport("__Internal")]
-	public static extern void __iosIsRealnameAuth();
-
-	[DllImport("__Internal")]
-	public static extern void __iosGetSdkType();
-
-	[DllImport("__Internal")]
-	public static extern void __iosGetSdkChannel();
-
-	[DllImport("__Internal")]
-	public static extern void __iosGetSdkVersion();
-
-	[DllImport("__Internal")]
-	public static extern void __iosCreateRole(string roleid, string rolename);
-
-	[DllImport("__Internal")]
-	public static extern void __iosNotifyZone(string serverid, string servername, string roleid, string rolename);
-
-	[DllImport("__Internal")]
-	public static extern void __iosSetGameOpenUrl(string url);
-
-	[DllImport("__Internal")]
-	public static extern void __iosHeartbeatStart();
-
-	[DllImport("__Internal")]
-	public static extern void __iosHeartbeatStop();
-
-	[DllImport("__Internal")]
-	public static extern void __iosAgreementWithLicence();
-
-	[DllImport("__Internal")]
-	public static extern void __iosAgreementWithPrivacy();
-
-	[DllImport("__Internal")]
-	public static extern void __iosGeetest();
-
-	[DllImport("__Internal")]
-	public static extern void __iosAccountProtect();
-
-	[DllImport("__Internal")]
-	public static extern void __iosGetFreeUrl(string sourceUrl, string gameId, string appKey);
-
-	[DllImport("__Internal")]
-	public static extern void __iosPay(string productId, string outTradeNo, string money, string productName, string productCount, string description,string extension,  string orderSign, string notifyUrl);
-
-	//android unity调用java层方法
-	public static void callSdkApi (string apiName, params object[] args)
-	{	
-		using (AndroidJavaClass cls = new AndroidJavaClass("com.gsc.unityasdemo.GSCSdkCenter")) {
-			cls.CallStatic (apiName, args);
-		}
-	}
-
-
-	/**
-	 * android 支付接口
-	 * @param uid 用户的唯一标识(整型)
-	 * @param username 用户名或者email(唯一)
-	 * @param role 充值的角色信息
-	 * @param serverId 区服号
-	 * @param total_fee 充值金额
-	 * @param game_money 游戏币,需要用充值金额*充值比率
-	 * @param out_trade_no 充值订单号
-	 * @param subject 充值主题
-	 * @param body 充值描述
-	 * @param extension_info 附加信息,会在服务器异步回调中原样传回
-	 */
-	public static void androidPay(long uid, string username, string role, string serverId,
-	                       int total_fee, int game_money, string out_trade_no, string subject, string body, string extension_info, string notify_url, string order_sign)
-	{
-		#if UNITY_ANDROID
-			callSdkApi ("pay", uid, username, role, serverId, total_fee, game_money, out_trade_no, subject, body, extension_info, notify_url, order_sign);
-		#endif
-	}
-
-	/**
-	 * android获取设备指纹信息接口
-	 */
-	public static void androidFingerprint()
-	{
-		#if UNITY_ANDROID
-			callSdkApi ("getFingerprint");
-		#endif
-	}
-
-	/**
-	 * android获取是否登录接口
-	 */
-	public static void androidCheckLogin()
-	{
-		#if UNITY_ANDROID
-			callSdkApi ("checkLogin");
-		#endif
-	}
-
-	/**
-	 * android退出接口
-	 */
-	public static void androidExit ()
-	{
-		#if UNITY_ANDROID
-			callSdkApi ("exit");
-		#endif
-	}
-
-	/**
-	 * iOS支付接口
-	 */
-	public static void iOSPay(string product_id, string out_trade_no, int money, string subject, int game_money, string body, string extension_info, string order_sign, string notify_url)
-	{
-		#if UNITY_IOS
-			__iosPay(product_id, out_trade_no, money, subject, game_money, body, extension_info, order_sign, notify_url);
-		#endif
-	}
-
-	/**
-	 * iOS获取sdk的版本接口
-	 */
-	public static void iOSSdkVersion()
-	{
-		#if UNITY_IOS
-			__iosGetSdkVersion();
-		#endif
-	}
-	/**
-	 * 初始化
-	 */
-	public static void init(string merchant_id, string app_id, string server_id, string app_key, string sandboxKey)
-	{
-		Debug.Log("init");
-		#if UNITY_IOS
-			__initIosSDK(merchant_id, app_id, server_id, app_key, sandboxKey);
-		#elif UNITY_ANDROID
-			callSdkApi ("init", merchant_id, app_id, server_id, app_key);
-		#endif
-	}
-
-	/**
-	 * 登录接口
-	 */
-	public static void login ()
-	{
-		#if UNITY_IOS
-            __iosLogin();
-		#elif UNITY_ANDROID
-			callSdkApi ("login");
-		#endif
-	}
-
-	/**
-	 * 通知区服接口
-	 */
-	public static void notifyZone(string server_id, string server_name, string role_id, string role_name)
-	{
-		#if UNITY_IOS
-			__iosNotifyZone(server_id, server_name, role_id, role_name);
-		#elif UNITY_ANDROID
-			callSdkApi ("notifyZone", server_id, server_name, role_id, role_name);
-		#endif
-	}
-
-	/**
-	 * 创角接口
-	 */
-	public static void createRole(string role_name, string role_id)
-	{
-		#if UNITY_IOS
-			__iosCreateRole(role_name, role_id);
-		#elif UNITY_ANDROID
-			callSdkApi ("createRole", role_id, role_name);
-		#endif
-	}
-
-	/**
-	 * 停止心跳接口
-	 */
-	public static void stopHeartbeat()
-	{
-		#if UNITY_IOS
-			__iosHeartbeatStop();
-		#elif UNITY_ANDROID
-			callSdkApi ("stop");
-		#endif
-	}
-
-	/**
-	 * 开始心跳接口
-	 */
-	public static void startHeartbeat()
-	{
-		#if UNITY_IOS
-			__iosHeartbeatStart();
-		#elif UNITY_ANDROID
-			callSdkApi ("start");
-		#endif
-	}
-
-	/**
-	 * 获取sdk类型接口
-	 */
-	public static void getSdkType()
-	{
-		#if UNITY_IOS
-			__iosGetSdkType();
-		#elif UNITY_ANDROID
-			callSdkApi ("getSdkType");
-		#endif
-	}
-
-	/**
-	 * 获取渠道号接口
-	 */
-	public static void getChannelId()
-	{
-		#if UNITY_IOS
-			__iosGetSdkChannel();
-		#elif UNITY_ANDROID
-			callSdkApi ("getChannelId");
-		#endif
-	}
-	
-	/**
-	 * 获取是否实名认证接口
-	 */
-	public static void isRealNameAuth(){
-		#if UNITY_IOS
-			__iosIsRealnameAuth();
-		#elif UNITY_ANDROID
-			callSdkApi ("isRealNameAuth");
-		#endif
-	}
-
-	/**
-	 * 登出接口
-	 */
-	public static void logout()
-	{
-		#if UNITY_IOS
-			__iosLogout();
-		#elif UNITY_ANDROID
-			callSdkApi ("logout");
-		#endif
-	}
-
-	/**
-	 * 获取用户信息接口
-	 */
-	public static void getUserInfo(string accesskey)
-	{
-		#if UNITY_IOS
-			__iosUserInfo(accesskey);
-		#elif UNITY_ANDROID
-			callSdkApi ("getUserInfo");
-		#endif
-	}
-
-	/**
-	 * 账号保护接口
-	 */
-	public static void accountProtect ()
-	{
-		#if UNITY_IOS
-			__iosAccountProtect();
-		#elif UNITY_ANDROID
-			callSdkApi ("accountProtect");
-		#endif
-	}
-
-
-	/**
-	 * 显示用户协议界面接口
-	 */
-	public static void showAgreementWithLicence ()
-	{
-		#if UNITY_IOS
-			__iosAgreementWithLicence();
-		#elif UNITY_ANDROID
-			callSdkApi ("showAgreementWithLicence");
-		#endif
-	}
-
-	/**
-	 * 显示隐私政策界面接口
-	 */
-	public static void showAgreementWithPrivacy ()
-	{
-		#if UNITY_IOS
-			__iosAgreementWithPrivacy();
-		#elif UNITY_ANDROID
-			callSdkApi ("showAgreementWithPrivacy");
-		#endif
-	}
-
-	/**
-	 * 显示人机验证接口
-	 */
-	public static void showGeetestView ()
-	{
-		#if UNITY_IOS
-			__iosGeetest();
-		#elif UNITY_ANDROID
-			callSdkApi ("showGeetestView");
-		#endif
-	}
-
-	//测试
-	public static void showToast(string content)
-	{
-		#if UNITY_IOS
-
-
-		#elif UNITY_ANDROID
-			callSdkApi ("showToast", content);
-		#endif
-
-	}
-
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/bilibili/GSCSdkInterface.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c1d549bcb56534dea8c19d32a0ca6c10
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839.meta

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

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839/sdk.meta

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

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives.meta

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

+ 0 - 58
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/HykbGameArchives.cs

@@ -1,58 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using com.m3839.sdk.archives.bean;
-using com.m3839.sdk.archives.listener;
-
-/// <summary>
-/// 云存档sdk的 API
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.archives
-{
-
-    public class HykbGameArchives
-    {
-        static AndroidJavaClass gameArchives = new AndroidJavaClass("com.m3839.sdk.archives.HykbGameArchives");
-
-        [System.Obsolete("该方法已过时")]
-        public static void SaveArchivesData(GameArchivesDataBean bean, HykbSaveArchivesListener listener)
-        {
-            gameArchives.CallStatic("saveArchivesData", HykbContext.GetInstance().GetActivity(), GameArchivesDataBean.ToA(bean), listener);
-        }
-
-        [System.Obsolete("该方法已过时")]
-        public static void ReadArchivesData(GameArchivesDataBean bean, HykbReadArchivesListener listener)
-        {
-            gameArchives.CallStatic("readArchivesData", HykbContext.GetInstance().GetActivity(), GameArchivesDataBean.ToA(bean), listener);
-        }
-
-        [System.Obsolete("该方法已过时")]
-        public static void LoadAllArchivesData(GameArchivesDataBean bean, HykbLoadArchivesListener listener)
-        {
-            gameArchives.CallStatic("loadAllArchivesData", HykbContext.GetInstance().GetActivity(), GameArchivesDataBean.ToA(bean), listener);
-        }
-
-
-        public static void Init(string gameId)
-        {
-            gameArchives.CallStatic("init", HykbContext.GetInstance().GetActivity(), gameId);
-        }
-
-        public static void SaveArchivesDataV2(GameArchivesDataBean bean, HykbSaveArchivesListener listener)
-        {
-            gameArchives.CallStatic("saveArchivesData", GameArchivesDataBean.ToA(bean), listener);
-        }
-
-        public static void ReadArchivesDataV2(GameArchivesDataBean bean, HykbReadArchivesListener listener)
-        {
-            gameArchives.CallStatic("readArchivesData", GameArchivesDataBean.ToA(bean), listener);
-        }
-
-        public static void LoadAllArchivesDataV2(GameArchivesDataBean bean, HykbLoadArchivesListener listener)
-        {
-            gameArchives.CallStatic("loadAllArchivesData", GameArchivesDataBean.ToA(bean), listener);
-        }
-    }
-
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/HykbGameArchives.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: f018cd9dcb2e2be4d9451b6993ae3482
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/bean.meta

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

+ 0 - 140
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/bean/GameArchivesDataBean.cs

@@ -1,140 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 游戏档位数据
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.archives.bean
-{
-    public class GameArchivesDataBean 
-    {
-        /** 游戏ID */
-        private string gameId;
-
-        /** 用户ID */
-        private string userId;
-
-        /** 存档ID */
-        private int archivesId;
-
-        /** 存档标题*/
-        private string archivesTitle;
-
-        /** 存档内容*/
-        private string archivesContent;
-
-        /** 存档透传字段*/
-        private string archivesExt;
-
-        /** 存档的时间 */
-        private string updateTime;
-
-
-        public GameArchivesDataBean()
-        {
-
-        }
-
-        /// <summary>
-        /// 游戏档位数据
-        /// </summary>
-        public GameArchivesDataBean(AndroidJavaObject bean)
-        {
-            this.gameId = bean.Call<string>("getGameId");
-            this.userId = bean.Call<string>("getUserId");
-            this.archivesId = bean.Call<int>("getArchivesId");
-            this.archivesTitle = bean.Call<string>("getGiftLinkTitle");
-            this.archivesContent = bean.Call<string>("getArchivesContent");
-            this.archivesExt = bean.Call<string>("getArchivesExt");
-            this.updateTime = bean.Call<string>("getUpdateTime");
-        }
-
-        [System.Obsolete("该方法已过时")]
-        public string getGameId()
-        {
-            return gameId;
-        }
-
-        [System.Obsolete("该方法已过时")]
-        public void setGameId(string gameId)
-        {
-            this.gameId = gameId;
-        }
-
-        public string getUserId()
-        {
-            return userId;
-        }
-
-        public void setUserId(string userId)
-        {
-            this.userId = userId;
-        }
-
-        public int getArchivesId()
-        {
-            return archivesId;
-        }
-
-        public void setArchivesId(int archivesId)
-        {
-            this.archivesId = archivesId;
-        }
-
-        public string getArchivesTitle()
-        {
-            return archivesTitle;
-        }
-
-        public void setArchivesTitle(string archivesTitle)
-        {
-            this.archivesTitle = archivesTitle;
-        }
-
-        public string getArchivesContent()
-        {
-            return archivesContent;
-        }
-
-        public void setArchivesContent(string archivesContent)
-        {
-            this.archivesContent = archivesContent;
-        }
-
-        public string getArchivesExt()
-        {
-            return archivesExt;
-        }
-
-        public void setArchivesExt(string archivesExt)
-        {
-            this.archivesExt = archivesExt;
-        }
-
-        public string getUpdateTime()
-        {
-            return updateTime;
-        }
-
-        public void setUpdateTime(string updateTime)
-        {
-            this.updateTime = updateTime;
-        }
-
-        public static AndroidJavaObject ToA(GameArchivesDataBean bean)
-        {
-            AndroidJavaObject payInfo = new AndroidJavaObject("com.m3839.sdk.archives.bean.GameArchivesDataBean");
-            payInfo.Call("setGameId", bean.getGameId());
-            payInfo.Call("setUserId", bean.getUserId());
-            payInfo.Call("setArchivesId", bean.getArchivesId());
-            payInfo.Call("setArchivesTitle", bean.getArchivesTitle());
-            payInfo.Call("setArchivesContent", bean.getArchivesContent());
-            payInfo.Call("setArchivesExt", bean.getArchivesExt());
-            payInfo.Call("setUpdateTime", bean.getUpdateTime());
-            return payInfo;
-        }
-    }
-}
-

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/bean/GameArchivesDataBean.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: fd045657ace369e4593c614295135f00
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener.meta

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

+ 0 - 53
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbLoadArchivesListener.cs

@@ -1,53 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-
-/// <summary>
-/// 获取存档列表的数据监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.archives.listener
-{
-
-    public abstract class HykbLoadArchivesListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 云存档列表数据校验回调接口
-        /// </summary>
-        public HykbLoadArchivesListener() : base("com.m3839.sdk.archives.listener.HykbLoadArchivesListener") { }
-
-        /// <summary>
-        /// 成功回调
-        /// </summary>
-        /// <param name="dataBean">存档数据</param>
-        public void onSuccess(List<AndroidJavaObject> dataBean)
-        {
-            OnSuccess(dataBean);
-        }
-
-        /// <summary>
-        /// 失败回调
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">失败的返回的信息</param>
-        public void onFailed(int code, string message)
-        {
-            OnFailed(code, message);
-        }
-
-        /// <summary>
-        /// 成功回调
-        /// </summary>
-        /// <param name="dataBean">存档数据</param>
-        public abstract void OnSuccess(List<AndroidJavaObject> dataBean);
-
-        /// <summary>
-        /// 失败回调
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">失败的返回的信息</param>
-        public abstract void OnFailed(int code, string message);
-    }
-}
-

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbLoadArchivesListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 9a5f65c689352e64aa4e4e610dc72c0b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 50
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbReadArchivesListener.cs

@@ -1,50 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 读档的数据监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.archives.listener
-{
-    public abstract class HykbReadArchivesListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 云存档列表数据校验回调接口
-        /// </summary>
-        public HykbReadArchivesListener() : base("com.m3839.sdk.archives.listener.HykbReadArchivesListener") { }
-
-        /// <summary>
-        /// 成功回调
-        /// </summary>
-        /// <param name="dataBean">存档数据</param>
-        public void onSuccess(AndroidJavaObject dataBean)
-        {
-            OnSuccess(dataBean);
-        }
-
-        /// <summary>
-        /// 失败回调
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">失败的返回的信息</param>
-        public void onFailed(int code, string message)
-        {
-            OnFailed(code, message);
-        }
-
-        /// <summary>
-        /// 成功回调
-        /// </summary>
-        /// <param name="dataBean">存档数据</param>
-        public abstract void OnSuccess(AndroidJavaObject dataBean);
-
-        /// <summary>
-        /// 失败回调
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">失败的返回的信息</param>
-        public abstract void OnFailed(int code, string message);
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbReadArchivesListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 57d292280dda9364e8ff88fa1b950dbf
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 48
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbSaveArchivesListener.cs

@@ -1,48 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 存档的数据监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.archives.listener
-{
-    public abstract class HykbSaveArchivesListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 云存档列表数据校验回调接口
-        /// </summary>
-        public HykbSaveArchivesListener() : base("com.m3839.sdk.archives.listener.HykbSaveArchivesListener") { }
-
-        /// <summary>
-        /// 成功回调
-        /// </summary>
-        public void onSuccess()
-        {
-            OnSuccess();
-        }
-
-        /// <summary>
-        /// 失败回调
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">失败的返回的信息</param>
-        public void onFailed(int code, string message)
-        {
-            OnFailed(code, message);
-        }
-
-        /// <summary>
-        /// 成功回调
-        /// </summary>
-        public abstract void OnSuccess();
-
-        /// <summary>
-        /// 失败回调
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">失败的返回的信息</param>
-        public abstract void OnFailed(int code, string message);
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbSaveArchivesListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 45ff47e81481c964e9054931e5785781
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs.meta

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

+ 0 - 168
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/HykbAuxsSDK.cs

@@ -1,168 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using com.m3839.sdk.auxs.bean;
-
-/// <summary>
-/// 强更sdk的 API
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.auxs
-{
-    public class HykbAuxsSDK
-    {
-        static AndroidJavaClass sdkClass = new AndroidJavaClass("com.m3839.sdk.auxs.HykbAuxSDK");
-
-        /// <summary>
-        /// SDK初始化
-        /// </summary>
-        /// <param name="gameId">快爆游戏ID</param>
-        /// <param name="orientation">屏幕方向</param>
-        /// <param name="listener">回调监听</param>
-        [System.Obsolete("该方法已过时")]
-        public static void initSdk(string gameId, int orientation, listener.HykbAuxInitListener listener)
-        {
-            sdkClass.CallStatic("init", HykbContext.GetInstance().GetActivity(), gameId, orientation, listener);
-        }
-
-        /// <summary>
-        /// SDK初始化
-        /// </summary>
-        /// <param name="gameId">快爆游戏ID</param>
-        /// <param name="orientation">屏幕方向</param>
-        /// <param name="listener">回调监听</param>
-        public static void Init(string gameId, int orientation, listener.HykbV2AuxInitListener listener)
-        {
-            sdkClass.CallStatic("init", HykbContext.GetInstance().GetActivity(), gameId, orientation, listener);
-        }
-
-        /// <summary>
-        /// 礼包码(自带UI界面)
-        /// </summary>
-        /// <param name="device">唯一标识符</param>
-        /// <param name="listener">校验礼包码的回调</param>
-        [System.Obsolete("该方法已过时")]
-        public static void checkGiftCode(string device, listener.HykbAuxGiftListener listener)
-        {
-            sdkClass.CallStatic("checkGiftCode", device, listener);
-        }
-
-        /// <summary>
-        /// 礼包码(自带UI界面)
-        /// </summary>
-        /// <param name="device">唯一标识符</param>
-        /// <param name="listener">校验礼包码的回调</param>
-        public static void CheckGiftCode(string device, listener.HykbV2AuxGiftListener listener)
-        {
-            sdkClass.CallStatic("checkGiftCode", device, listener);
-        }
-
-        /// <summary>
-        /// 礼包码(不带UI界面,该接口给开发自定义UI界面使用)
-        /// </summary>
-        /// <param name="device">唯一标识符</param>
-        /// <param name="code">礼包码</param>
-        /// <param name="listener">校验礼包码的回调</param>
-        [System.Obsolete("该方法已过时")]
-        public static void checkGiftCode(string device, string code, listener.HykbAuxGiftListener listener)
-        {
-            sdkClass.CallStatic("checkGiftCode", device, code, listener);
-        }
-
-        /// <summary>
-        /// 礼包码(不带UI界面,该接口给开发自定义UI界面使用)
-        /// </summary>
-        /// <param name="device">唯一标识符</param>
-        /// <param name="code">礼包码</param>
-        /// <param name="listener">校验礼包码的回调</param>
-        public static void CheckGiftCode(string device, string code, listener.HykbV2AuxGiftListener listener)
-        {
-            sdkClass.CallStatic("checkGiftCode", device, code, listener);
-        }
-
-
-        /// <summary>
-        /// 激活码(自带UI界面)
-        /// </summary>
-        /// <param name="device">唯一标识符</param>
-        /// <param name="listener">校验激活码的回调</param>
-        [System.Obsolete("该方法已过时")]
-        public static void checkActivationCode(string device, listener.HykbAuxActivationListener listener)
-        {
-            sdkClass.CallStatic("checkActivationCode", device, listener);
-        }
-
-        /// <summary>
-        /// 激活码(自带UI界面)
-        /// </summary>
-        /// <param name="device">唯一标识符</param>
-        /// <param name="listener">校验激活码的回调</param>
-        public static void CheckActivationCode(string device, listener.HykbV2AuxActivationListener listener)
-        {
-            sdkClass.CallStatic("checkActivationCode", device, listener);
-        }
-
-        /// <summary>
-        /// 激活码(不带UI界面,该接口给开发自定义UI界面使用)
-        /// </summary>
-        /// <param name="device">唯一标识符</param>
-        /// <param name="code">激活码</param>
-        /// <param name="listener">校验激活码的回调</param>
-        [System.Obsolete("该方法已过时")]
-        public static void checkActivationCode(string device, string code, listener.HykbAuxActivationListener listener)
-        {
-            sdkClass.CallStatic("checkActivationCode", device, code, listener);
-        }
-
-        /// <summary>
-        /// 激活码(不带UI界面,该接口给开发自定义UI界面使用)
-        /// </summary>
-        /// <param name="device">唯一标识符</param>
-        /// <param name="code">激活码</param>
-        /// <param name="listener">校验激活码的回调</param>
-        public static void CheckActivationCode(string device, string code, listener.HykbV2AuxActivationListener listener)
-        {
-            sdkClass.CallStatic("checkActivationCode", device, code, listener);
-        }
-
-
-        /// <summary>
-        /// 激活码的UI文案数据信息
-        /// </summary>
-        /// <returns>返回激活码的UI文案数据实例</returns>
-        public static HykbActivationUiInfo getActivationUiInfo()
-        {
-            AndroidJavaObject activationObject = sdkClass.CallStatic<AndroidJavaObject>("getActivationUiInfo");
-            return activationObject == null ? null : new HykbActivationUiInfo(activationObject);
-        }
-
-        /// <summary>
-        /// 礼包码的UI文案数据信息
-        /// </summary>
-        /// <returns>返回礼包码码的UI文案数据实例</returns>
-        public static HykbGiftUiInfo getGiftUiInfo()
-        {
-            AndroidJavaObject activationObject = sdkClass.CallStatic<AndroidJavaObject>("getGiftUiInfo");
-            return activationObject == null ? null : new HykbGiftUiInfo(activationObject);
-        }
-
-        /// <summary>
-        /// 检测该设备id是否激活过
-        /// </summary>
-        /// <param name="device">唯一标识符</param>
-        /// <param name="listener">校验激活码是否激活的回调</param>
-        public static void getActivationStatusByDevice(string device, listener.HykbAuxActivationCheckListener listener)
-        {
-            sdkClass.CallStatic("getActivationStatusByDevice", device, listener);
-        }
-
-        /// <summary>
-        /// 页面跳转
-        /// </summary>
-        /// <param name="biz">业务id</param>
-        public static void openPageDetail(int biz)
-        {
-            sdkClass.CallStatic("openPageDetail",biz);
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/HykbAuxsSDK.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 916bcd55627c86f42986eef75e0f2fb0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean.meta

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

+ 0 - 77
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean/HykbActivationUiInfo.cs

@@ -1,77 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-
-/// <summary>
-/// 激活码UI的数据信息实体类
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.auxs.bean
-{
-    public class HykbActivationUiInfo
-    {
-        private string activationTitle;
-        private string activationLink;
-        private string activationKbLink;
-        private string activationLinkTitle;
-        private int activationLinkStatus;
-        /// <summary>
-        /// 激活码UI显示数据
-        /// </summary>
-        public HykbActivationUiInfo(AndroidJavaObject user)
-        {
-            this.activationTitle = user.Call<string>("getActivationTitle");
-            this.activationLink = user.Call<string>("getActivationLink");
-            this.activationKbLink = user.Call<string>("getActivationKbLink");
-            this.activationLinkTitle = user.Call<string>("getActivationLinkTitle");
-            this.activationLinkStatus = user.Call<int>("getActivationLinkStatus");
-        }
-
-        /// <summary>
-        /// 获得激活码UI标题
-        /// </summary>
-        /// <returns>获取礼包UI标题</returns>
-        public string getActivationTitle()
-        {
-            return activationTitle;
-        }
-
-        /// <summary>
-        /// 获得激活码弹窗链接
-        /// </summary>
-        /// <returns>激活码弹窗的链接</returns>
-        public string getActivationLink()
-        {
-            return activationLink;
-        }
-
-        /// <summary>
-        /// 获得激活码弹窗快爆app链接
-        /// </summary>
-        /// <returns>激活码弹窗快爆app链接</returns>
-        public string getActivationKbLink()
-        {
-            return activationKbLink;
-        }
-
-        /// <summary>
-        /// 获得激活码弹窗快爆链接
-        /// </summary>
-        /// <returns>激活码弹窗的链接文案</returns>
-        public string getActivationLinkTitle()
-        {
-            return activationLinkTitle;
-        }
-
-
-        /// <summary>
-        /// 链接地址状态:1、显示;0、关闭
-        /// </summary>
-        /// <returns>链接地址状态</returns>
-        public int getActivationLinkStatus()
-        {
-            return activationLinkStatus;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean/HykbActivationUiInfo.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 624ea5183fef3ff4ba01db414de52742
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 79
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean/HykbGiftUiInfo.cs

@@ -1,79 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 礼包UI的数据信息实体类
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.auxs.bean
-{
-    public class HykbGiftUiInfo
-    {
-        private string giftTitle;
-        private string giftLink;
-        private string giftKbLink;
-        private string giftLinkTitle;
-        private int giftLinkStatus;
-
-        /// <summary>
-        /// 礼包码UI显示数据
-        /// </summary>
-        public HykbGiftUiInfo(AndroidJavaObject user)
-        {
-            this.giftTitle = user.Call<string>("getGiftTitle");
-            this.giftLink = user.Call<string>("getGiftLink");
-            this.giftKbLink = user.Call<string>("getGiftKbLink");
-            this.giftLinkTitle = user.Call<string>("getGiftLinkTitle");
-            this.giftLinkStatus = user.Call<int>("getGiftLinkStatus");
-        }
-
-        /// <summary>
-        /// 礼包码UI标题
-        /// </summary>
-        /// <returns>用户编号字符串</returns>
-        public string getGiftTitle()
-        {
-            return giftTitle;
-        }
-
-        /// <summary>
-        /// 礼包码UI弹窗链接
-        /// </summary>
-        /// <returns>礼包码UI弹窗链接</returns>
-        public string getGiftLink()
-        {
-            return giftLink;
-        }
-
-        /// <summary>
-        /// 礼包码UI弹窗快爆app链接
-        /// </summary>
-        /// <returns>礼包码UI弹窗快爆app链接</returns>
-        public string getGiftKbLink()
-        {
-            return giftKbLink;
-        }
-
-        /// <summary>
-        /// 礼包码UI弹窗链接标题
-        /// </summary>
-        /// <returns>礼包码UI弹窗链接标题</returns>
-        public string getGiftLinkTitle()
-        {
-            return giftLinkTitle;
-        }
-
-        /// <summary>
-        /// 链接地址状态:1、显示;0、关闭
-        /// </summary>
-        /// <returns>链接地址状态</returns>
-        public int getGiftLinkStatus()
-        {
-            return giftLinkStatus;
-        }
-
-
-    }
-
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean/HykbGiftUiInfo.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6ce581c5713688742983783141504275
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener.meta

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

+ 0 - 33
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxActivationCheckListener.cs

@@ -1,33 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 激活码状态检测回调监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.auxs.listener
-{
-    public abstract class HykbAuxActivationCheckListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 激活码状态
-        /// </summary>
-        public HykbAuxActivationCheckListener() : base("com.m3839.sdk.auxs.listener.HykbAuxActivationCheckListener") { }
-
-        /// <summary>
-        /// 校验结果回调
-        /// </summary>
-        /// <param name="hasActivation">是否激活过</param>
-        public void onActivationCheck(bool hasActivation)
-        {
-            OnActivationCheck(hasActivation);
-        }
-
-        /// <summary>
-        /// 校验接口回调
-        /// </summary>
-        /// <param name="hasActivation">是否激活过</param>
-        public abstract void OnActivationCheck(bool hasActivation);
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxActivationCheckListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 2f11859083f5843409ed419f6b5dbdd0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 36
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxActivationListener.cs

@@ -1,36 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 激活码回调监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.auxs.listener
-{
-    [System.Obsolete("该接口已过时")]
-    public abstract class HykbAuxActivationListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 激活码校验回调接口
-        /// </summary>
-        public HykbAuxActivationListener() : base("com.m3839.sdk.auxs.listener.HykbAuxActivationListener") { }
-
-        /// <summary>
-        /// 校验结果回调
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">激活码,校验通过之后,返回的信息</param>
-        public void onResult(int code, string message)
-        {
-            OnResult(code, message);
-        }
-
-        /// <summary>
-        /// 校验接口回调
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">激活码,校验通过之后,返回的信息</param>
-        public abstract void OnResult(int code, string message);
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxActivationListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 792773838f2ffa544b957a911271bd3c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 38
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxGiftListener.cs

@@ -1,38 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 礼包码回调监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.auxs.listener
-{
-    [System.Obsolete("该接口已过时")]
-    public abstract class HykbAuxGiftListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 礼包码回调接口
-        /// </summary>
-        public HykbAuxGiftListener() : base("com.m3839.sdk.auxs.listener.HykbAuxGiftListener") { }
-
-        /// <summary>
-        /// 校验结果回调
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">礼包码,校验通过之后,返回的信息</param>
-        /// <param name="codeName">兑换成功,返回的礼包名称</param>
-        public void onResult(int code, string message, string codeName)
-        {
-            OnResult(code, message, codeName);
-        }
-
-        /// <summary>
-        /// 校验接口回调
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">礼包码,校验通过之后,返回的信息</param>
-        /// <param name="codeName">兑换成功,返回的礼包名称</param>
-        public abstract void OnResult(int code, string message, string codeName);
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxGiftListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 735386047038cb4408c3775e70a5d20c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 36
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxInitListener.cs

@@ -1,36 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 初始化回调监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.auxs.listener
-{
-    [System.Obsolete("该接口已过时")]
-    public abstract class HykbAuxInitListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// SDK进行初始化的回调监听
-        /// </summary>
-        public HykbAuxInitListener() : base("com.m3839.sdk.auxs.listener.HykbAuxInitListener") { }
-
-        /// <summary>
-        /// 登录操作结束
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">初始化结果,或者激活码的相关信息返回</param>
-        public void onInitFinish(int code, string message)
-        {
-            OnInitFinished(code, message);
-        }
-
-        /// <summary>
-        /// 登录操作结束
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">初始化结果,或者激活码的相关信息返回</param>
-        public abstract void OnInitFinished(int code, string message);
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxInitListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6f29f207cc9cf5144a31e4ecd3fa6cdb
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 50
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxActivationListener.cs

@@ -1,50 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 激活码回调监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.auxs.listener
-{
-    public abstract class HykbV2AuxActivationListener : AndroidJavaProxy
-    {
-
-        /// <summary>
-        /// 激活码校验回调接口
-        /// </summary>
-        public HykbV2AuxActivationListener() : base("com.m3839.sdk.auxs.listener.HykbV2AuxActivationListener") { }
-
-        /// <summary>
-        /// 激活成功
-        /// </summary>
-        public void onSucceed()
-        {
-            OnSucceed();
-        }
-
-        /// <summary>
-        /// 激活失败
-        /// </summary>
-        /// <param name="code">返回码</param>
-        /// <param name="message"> 错误信息</param>
-        public void onFailed(int code, string message)
-        {
-            OnFailed(code, message);
-        }
-
-        /// <summary>
-        /// 激活成功
-        /// </summary>
-        public abstract void OnSucceed();
-
-        /// <summary>
-        /// 激活失败
-        /// </summary>
-        /// <param name="code">返回码</param>
-        /// <param name="message"> 错误信息</param>
-        public abstract void OnFailed(int code, string message);
-    }
-}
-

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxActivationListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 93af1fd7d9a604749a4762901c111d6d
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 51
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxGiftListener.cs

@@ -1,51 +0,0 @@
-using UnityEngine;
-using System.Collections;
-
-/// <summary>
-/// 礼包码回调监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.auxs.listener
-{
-    public abstract class HykbV2AuxGiftListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 礼包码回调接口
-        /// </summary>
-        public HykbV2AuxGiftListener() : base("com.m3839.sdk.auxs.listener.HykbV2AuxGiftListener") { }
-
-        /// <summary>
-        /// 激活成功
-        /// </summary>
-        /// <param name="giftName">礼包名称</param>
-        public void onSucceed(string giftName)
-        {
-            OnSucceed(giftName);
-        }
-
-        /// <summary>
-        /// 激活失败
-        /// </summary>
-        /// <param name="code">返回码</param>
-        /// <param name="message"> 错误信息</param>
-        public void onFailed(int code, string message)
-        {
-            OnFailed(code, message);
-        }
-
-        /// <summary>
-        /// 激活成功
-        /// </summary>
-        /// <param name="giftName">礼包名称</param>
-        public abstract void OnSucceed(string giftName);
-
-        /// <summary>
-        /// 激活失败
-        /// </summary>
-        /// <param name="code">返回码</param>
-        /// <param name="message"> 错误信息</param>
-        public abstract void OnFailed(int code, string message);
-
-    }
-}
-

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxGiftListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8fbcef9b5137941b1826643b031eda09
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 50
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxInitListener.cs

@@ -1,50 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 初始化回调监听V2接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.auxs.listener
-{
-    public abstract class HykbV2AuxInitListener : AndroidJavaProxy
-    {
-
-        /// <summary>
-        /// SDK进行初始化的回调监听
-        /// </summary>
-        public HykbV2AuxInitListener() : base("com.m3839.sdk.auxs.listener.HykbV2AuxInitListener") { }
-
-        /// <summary>
-        /// 初始化流程结束
-        /// </summary>
-        public void onSucceed()
-        {
-            OnSucceed();
-        }
-
-        /// <summary>
-        ///初始化失败
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">初始化结果,或者激活码的相关信息返回</param>
-        public void onFailed(int code, string message)
-        {
-            OnFailed(code, message);
-        }
-
-        /// <summary>
-        /// 初始化流程结束
-        /// </summary>
-        public abstract void OnSucceed();
-
-        /// <summary>
-        ///初始化失败
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">初始化结果,或者激活码的相关信息返回</param>
-        public abstract void OnFailed(int code, string message);
-    }
-}
-

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxInitListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d3deb597f6a9b4a13a2465a9612a3603
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/common.meta

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

+ 0 - 64
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/common/HykbContext.cs

@@ -1,64 +0,0 @@
-using UnityEngine;
-
-/// <summary>
-/// For support android context
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk
-{
-    public sealed class HykbContext : MonoBehaviour
-    {
-        // 横屏
-        public static int SCREEN_LANDSCAPE = 0;
-        // 竖屏
-        public static int SCREEN_PORTRAIT = 1;
-
-        private AndroidJavaObject currentActivity;
-
-        private static readonly HykbContext _HykbContext = new HykbContext();
-
-       
-        /// <summary>
-        /// 获取当前实例 
-        /// </summary>
-        /// <returns></returns>
-        public static HykbContext GetInstance()
-        {
-            return _HykbContext;
-        }
-
-
-        /*
-         * 获取当前Activity       
-         */
-        public AndroidJavaObject GetActivity()
-        {
-            if (null == currentActivity)
-            {
-                currentActivity = new AndroidJavaClass("com.unity3d.player.UnityPlayer")
-                .GetStatic<AndroidJavaObject>("currentActivity");
-            }
-
-            return currentActivity;
-        }
-
-        /*
-         * 运行在主UI线程       
-         */
-        public void RunOnUIThread(AndroidJavaRunnable runnable)
-        {
-            GetActivity().Call("runOnUiThread", runnable);
-        }
-
-
-        /*
-         * 获取根节点的布局 
-         */
-        public AndroidJavaObject GetRootLayout()
-        {
-            AndroidJavaClass R = new AndroidJavaClass("android.R$id");
-            return currentActivity.Call<AndroidJavaObject>("findViewById", R.GetStatic<int>("content"));
-        }
-    }
-}
-

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/common/HykbContext.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: de2e78829392548c99bbd11a367fa04a
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login.meta

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

+ 0 - 124
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/HykbLogin.cs

@@ -1,124 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 好游快爆SDK
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.login
-{
-    /// <summary>
-    /// 好游快爆SDK的静态方法包装,用于untiy与安卓SDK对接及交互。
-    /// </summary>
-    public class HykbLogin
-    {
-        
-        // 单例中间层对象,方便获取
-        private static AndroidJavaClass sLoginJavaClass;
-        public static AndroidJavaClass getLoginClass()
-        {
-            if (sLoginJavaClass == null)
-            {
-                sLoginJavaClass = new AndroidJavaClass("com.m3839.sdk.login.HykbLogin");
-            }
-            return sLoginJavaClass;
-        }
-
-        /// <summary>
-        /// SDK初始化
-        /// </summary>
-        /// <param name="appKey">快爆开发者后台申请的appKey</param>
-        /// <param name="listener">初始化的回调监听</param>
-        [System.Obsolete("该方法已过时")]
-        public static void InitSdk(string appKey, int orientation, listener.HykbInitListener listener)
-        {
-            getLoginClass().CallStatic("initSdk", HykbContext.GetInstance().GetActivity(), appKey, orientation, listener);
-        }
-
-        /// <summary>
-        /// SDK初始化
-        /// </summary>
-        /// <param name="appKey">快爆开发者后台申请的appKey</param>
-        /// <param name="listener">初始化的回调监听</param>
-        public static void Init(string appKey, int orientation, listener.HykbV2InitListener listener)
-        {
-            getLoginClass().CallStatic("init", HykbContext.GetInstance().GetActivity(), appKey, orientation, listener);
-        }
-
-        /// <summary>
-        /// 设置用户相关监听
-        /// </summary>
-        /// <param name="listener">用户相关的监听接口</param>
-        public static void SetUserListener(listener.HykbUserListener listener)
-        {
-            getLoginClass().CallStatic("setUserListener", listener);
-        }
-
-        /// <summary>
-        /// 设置防沉迷相关监听
-        /// </summary>
-        /// <param name="listener">防沉迷相关的监听接口</param>
-        public static void SetAntiListener(listener.HykbAntiListener listener)
-        {
-            getLoginClass().CallStatic("setAntiListener", listener);
-        }
-
-        /// <summary>
-        /// 登录
-        /// </summary>
-        /// <param name="listener">登录操作的回调监听</param>
-        [System.Obsolete("该方法已过时")]
-        public static void Login(listener.HykbLoginListener listener)
-        {
-            getLoginClass().CallStatic("login", HykbContext.GetInstance().GetActivity(), listener);
-        }
-
-        /// <summary>
-        /// 登录
-        /// </summary>
-        public static void Login()
-        {
-            getLoginClass().CallStatic("login", HykbContext.GetInstance().GetActivity());
-        }
-
-        /// <summary>
-        /// 切换账号
-        /// </summary>
-        /// <param name="listener">切换账号的回调监听</param>
-        [System.Obsolete("该方法已过时")]
-        public static void SwitchAccount(listener.HykbLoginListener listener)
-        {
-            getLoginClass().CallStatic("switchAccount", HykbContext.GetInstance().GetActivity(), listener);
-        }
-
-        /// <summary>
-        /// 切换账号
-        /// </summary>
-        public static void SwitchAccount()
-        {
-            getLoginClass().CallStatic("switchAccount", HykbContext.GetInstance().GetActivity());
-        }
-
-        /// <summary>
-        /// 获得当前用户信息
-        /// </summary>
-        /// <returns>有用户信息是返回用户信息HykbUser实例,无则返回null</returns>
-        public static bean.HykbUser GetUser()
-        {
-            AndroidJavaObject userObject = getLoginClass().CallStatic<AndroidJavaObject>("getUser");
-            return userObject == null ? null : new bean.HykbUser(userObject);
-        }
-
-        /// <summary>
-        /// 退出登录,注销用户的登录信息
-        /// </summary>
-        public static void Logout()
-        {
-            getLoginClass().CallStatic("logout", HykbContext.GetInstance().GetActivity());
-        }
-
-    }
-
-
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/HykbLogin.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 265a5fcbb139e4c77b08182faef5fb61
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/bean.meta

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

+ 0 - 73
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/bean/HykbUser.cs

@@ -1,73 +0,0 @@
-using UnityEngine;
-
-/// <summary>
-/// 快爆用户信息实体类
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.login.bean
-{
-    public class HykbUser
-    {
-        private string userId;
-        private string nick;
-        private string type;
-        private string accessToken;
-
-        /// <summary>
-        /// 用户信息包装
-        /// </summary>
-        public HykbUser(AndroidJavaObject user)
-        {
-            this.userId = user.Call<string>("getUserId");
-            this.nick = user.Call<string>("getNick");
-            this.type = user.Call<string>("getType");
-            this.accessToken = user.Call<string>("getAccessToken");
-        }
-
-        /// <summary>
-        /// 获得用户ID
-        /// </summary>
-        /// <returns>用户编号字符串</returns>
-        public string getUserId()
-        {
-            return userId;
-        }
-
-        /// <summary>
-        /// 获得昵称
-        /// </summary>
-        /// <returns>昵称字符串</returns>
-        public string getNick()
-        {
-            return nick;
-        }
-
-        /// <summary>
-        /// 获得登录类型
-        /// </summary>
-        /// <returns>类型字符串</returns>
-        public string getType()
-        {
-            return type;
-        }
-
-        /// <summary>
-        /// 用来校验登录授权过程真实性,accessToken有效期两小时
-        /// </summary>
-        /// <returns>类型字符串</returns>
-        public string getAccessToken()
-        {
-            return accessToken;
-        }
-
-        public string toString()
-        {
-            return "HykbUser{" +
-                    "userId='" + userId + '\'' +
-                    ", nick='" + nick + '\'' +
-                    ", type='" + type + '\'' +
-                    ", accessToken='" + accessToken + '\'' +
-                    '}';
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/bean/HykbUser.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e82d4ff270dc64acc9f0e34a37570e7b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener.meta

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

+ 0 - 31
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbAntiListener.cs

@@ -1,31 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 防沉迷相关回调监听V2接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.login.listener
-{
-    public abstract class HykbAntiListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 防沉迷相关回回调监听
-        /// </summary>
-        public HykbAntiListener() : base("com.m3839.sdk.login.listener.HykbAntiListener") { }
-
-        /// <summary>
-        /// 防沉迷相关回回调
-        /// </summary>
-        /// <param name="code">响应code</param>
-        /// <param name="message">响应消息</param>
-        public void onAnti(int code, string message)
-        {
-            OnAnti(code, message);
-        }
-
-        public abstract void OnAnti(int code, string message);
-    }
-}
-

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbAntiListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 28c2dc2f56a444c6aaeee4a82f9c6ea3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 82
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbInitListener.cs

@@ -1,82 +0,0 @@
-using UnityEngine;
-
-/// <summary>
-/// 初始化回调监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.login.listener
-{
-    [System.Obsolete("该接口已过时")]
-    public abstract class HykbInitListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 初始化回调监听,继承自SDK源码,为避免untiy使用冲突,另外提供给untiy继承的为首字母大写形式的接口。
-        /// </summary>
-        public HykbInitListener() : base("com.m3839.sdk.login.listener.HykbInitListener") { }
-
-        /// <summary>
-        /// SDK初始化成功,并根据用户登录情况返回用户信息
-        /// </summary>
-        /// <param name="user">有用户信息就返回用户信息,无则返回null</param>
-        public void onInitSuccess(AndroidJavaObject user)
-        {
-            if (user == null)
-            {
-                OnInitSuccess(null);
-            }
-            else
-            {
-                OnInitSuccess(new bean.HykbUser(user));
-            }
-        }
-
-        /// <summary>
-        /// 初始化失败,并返回失败码及提示
-        /// </summary>
-        /// <param name="code">失败码</param>
-        /// <param name="message">提示</param>
-        public void onInitError(int code, string message)
-        {
-            OnInitError(code, message);
-        }
-
-        /// <summary>
-        /// 初始化后有用户信息,但已失效且让玩家重新登录或切换账号
-        /// </summary>
-        /// <param name="switchUser">是否重新登录或切换账号</param>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="user">有用户信息就返回用户信息,无则返回null</param>
-        public void onSwitchUser(bool switchUser, int code, AndroidJavaObject user)
-        {
-            if (user == null)
-            {
-                OnSwitchUser(switchUser, code, null);
-            }
-            else
-            {
-                OnSwitchUser(switchUser, code, new bean.HykbUser(user));
-            }
-        }
-
-        /// <summary>
-        /// SDK初始化成功,并根据用户登录情况返回用户信息
-        /// </summary>
-        /// <param name="user">有用户信息就返回用户信息,无则返回null</param>
-        public abstract void OnInitSuccess(bean.HykbUser user);
-
-        /// <summary>
-        /// 初始化失败,并返回失败码及提示
-        /// </summary>
-        /// <param name="code">失败码</param>
-        /// <param name="message">提示</param>
-        public abstract void OnInitError(int code, string message);
-
-        /// <summary>
-        /// 初始化后有用户信息,但已失效且让玩家重新登录或切换账号
-        /// </summary>
-        /// <param name="switchUser">是否重新登录或切换账号</param>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="user">有用户信息就返回用户信息,无则返回null</param>
-        public abstract void OnSwitchUser(bool switchUser, int code, bean.HykbUser user);
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbInitListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: c2901dea2269842d68fdb4d48ca9820b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 46
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbLoginListener.cs

@@ -1,46 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 登录回调监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.login.listener
-{
-    [System.Obsolete("该接口已过时")]
-    public abstract class HykbLoginListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 登录或者切换账号回调监听,继承自SDK源码,为避免untiy使用冲突,另外提供给untiy继承的为首字母大写形式的接口。
-        /// </summary>
-        public HykbLoginListener() : base("com.m3839.sdk.login.listener.HykbLoginListener") { }
-
-        /// <summary>
-        /// 登录操作结束
-        /// </summary>
-        /// <param name="login">是否有登录</param>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="user">有用户信息就返回用户信息,无则返回null</param>
-        public void onLoginFinished(bool login, int code, AndroidJavaObject user)
-        {
-            if (user == null)
-            {
-                OnLoginFinished(login, code, null);
-            }
-            else
-            {
-                OnLoginFinished(login, code, new bean.HykbUser(user));
-            }
-        }
-
-
-        /// <summary>
-        /// 登录操作结束
-        /// </summary>
-        /// <param name="login">是否有登录</param>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="user">有用户信息就返回用户信息,无则返回null</param>
-        public abstract void OnLoginFinished(bool login, int code, bean.HykbUser user);
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbLoginListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: b9f46698884b04196a86b6f060d3e603
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 68
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbUserListener.cs

@@ -1,68 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-
-/// <summary>
-/// 用户相关回调监听V2接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.login.listener
-{
-    public abstract class HykbUserListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 用户相关回回调监听
-        /// </summary>
-        public HykbUserListener() : base("com.m3839.sdk.login.listener.HykbUserListener") { }
-
-        /// <summary>
-        /// 登录成功
-        /// </summary>
-        /// <param name="user">用户信息</param>
-        public void onLoginSucceed(AndroidJavaObject user)
-        {
-            OnLoginSucceed(new bean.HykbUser(user));
-        }
-
-        /// <summary>
-        /// 登录失败
-        /// </summary>
-        /// <param name="code">返回code</param>
-        /// <param name="message">失败原因</param>
-        public void onLoginFailed(int code, string message)
-        {
-            OnLoginFailed(code, message);
-        }
-
-        /// <summary>
-        /// 切换账号
-        /// </summary>
-        /// <param name="user">用户信息</param>
-        public void onSwitchUser(AndroidJavaObject user)
-        {
-            OnSwitchUser(new bean.HykbUser(user));
-        }
-
-        /// <summary>
-        /// 登录成功
-        /// </summary>
-        /// <param name="user">用户信息</param>
-        public abstract void OnLoginSucceed(bean.HykbUser user);
-
-
-        /// <summary>
-        /// 登录失败
-        /// </summary>
-        /// <param name="code">返回code</param>
-        /// <param name="message">失败原因</param>
-        public abstract void OnLoginFailed(int code, string message);
-
-        /// <summary>
-        /// 切换账号
-        /// </summary>
-        /// <param name="user">用户信息</param>
-        public abstract void OnSwitchUser(bean.HykbUser user);
-    }
-}
-

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbUserListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 9fc97a3a4b479435cac792a9cff4d1a5
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 51
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbV2InitListener.cs

@@ -1,51 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 初始化回调监听V2接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.login.listener
-{
-
-    public abstract class HykbV2InitListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 初始化回调监听,继承自SDK源码,为避免untiy使用冲突,另外提供给untiy继承的为首字母大写形式的接口。
-        /// </summary>
-        public HykbV2InitListener() : base("com.m3839.sdk.login.listener.HykbV2InitListener") { }
-
-        /// <summary>
-        /// 初始化成功
-        /// </summary>
-        public void onSucceed()
-        {
-            OnSucceed();
-        }
-
-        /// <summary>
-        /// 初始化失败
-        /// </summary>
-        /// <param name="code">返回码</param>
-        /// <param name="message"> 错误信息</param>
-        public void onFailed(int code, string message)
-        {
-            OnFailed(code, message);
-        }
-
-        /// <summary>
-        /// 初始化成功
-        /// </summary>
-        public abstract void OnSucceed();
-
-        /// <summary>
-        /// 初始化失败
-        /// </summary>
-        /// <param name="code">返回码</param>
-        /// <param name="message"> 错误信息</param>
-        public abstract void OnFailed(int code, string message);
-    }
-
-}
-

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/listener/HykbV2InitListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 000e6d821f8664586adab93817d23190
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/paid.meta

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

+ 0 - 51
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/paid/HykbCheckListener.cs

@@ -1,51 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-
-/// <summary>
-/// 付费下载校验监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.paid
-{
-    public abstract class HykbCheckListener : AndroidJavaProxy
-    {
-        /// <summary>
-        /// 快爆单机防沉迷回调接口
-        /// </summary>
-        public HykbCheckListener() : base("com.m3839.sdk.paid.HykbCheckListener") { }
-
-
-
-        void onAllowEnter()
-        {
-
-        }
-
-        /// <summary>
-        /// 校验不通过回调
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">返回的信息</param>
-        void onReject(int code, string errorMsg)
-        {
-
-        }
-
-
-        /// <summary>
-        /// 校验成功回调
-        /// </summary>
-        public abstract void OnAllowEnter();
-
-        /// <summary>
-        /// 校验失败回调
-        /// </summary>
-        /// <param name="code">code码,SDK预留</param>
-        /// <param name="message">失败的返回的信息</param>
-        public abstract void OnReject(int code, string message);
-
-
-    }
-}
-

+ 0 - 11
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/paid/HykbCheckListener.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: d08f16179ba4f984ebe8c8b5cebd46e9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 31
GameClient/Assets/Game/HotUpdate/com/m3839/sdk/paid/HykbPaidChecker.cs

@@ -1,31 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-/// <summary>
-/// 付费下载校验监听接口
-/// create by chenbaoyang
-/// </summary>
-namespace com.m3839.sdk.paid
-{
-    public class HykbPaidChecker 
-    {
-        static AndroidJavaClass sdkClass = new AndroidJavaClass("com.m3839.sdk.paid.HykbPaidChecker");
-
-        public static void CheckLicense(string appId, string publicKey, HykbCheckListener listener)
-        {
-            sdkClass.CallStatic("checkLicense", HykbContext.GetInstance().GetActivity(), appId, publicKey, listener);
-        }
-
-        public static void SetDebug(bool isDebug)
-        {
-            sdkClass.CallStatic("setDebug", isDebug);
-        }
-
-        public static void ReleaseSDK()
-        {
-            sdkClass.CallStatic("ReleaseSDK");
-        }
-    }
-}
-

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно