Browse Source

Merge branch 'master' into yujie

* master:
  限时累充
  抽奖
  商店资源替换
  引导
  购买月卡报错
  双人对战不显示头像
  奖池模型轮播
  每日签到动画
  取消每日签到按钮
  月卡加¥
  签到动画
  每日签到动画
  清理渠道接入
  部件动画特效处理
  部件动画特效处理
  特效层级
  战斗换装检查
  特效层级
  限时累充
Jae 2 years ago
parent
commit
91269b8f9d
100 changed files with 306 additions and 2765 deletions
  1. 2 2
      FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml
  2. 61 10
      FGUIProject/assets/DailyWelfare/DailySignUI.xml
  3. 1 1
      FGUIProject/assets/DailyWelfare/components/ComProBonus.xml
  4. 6 0
      FGUIProject/assets/DailyWelfare/components/ComSignBg.xml
  5. 6 0
      FGUIProject/assets/DailyWelfare/components/ComSignTop.xml
  6. 1 1
      FGUIProject/assets/DailyWelfare/components/ListChargeItem.xml
  7. 3 2
      FGUIProject/assets/DailyWelfare/components/ListSignItem.xml
  8. 10 7
      FGUIProject/assets/DailyWelfare/components/ProgressBar1.xml
  9. 0 1
      FGUIProject/assets/DailyWelfare/components/comPro.xml
  10. BIN
      FGUIProject/assets/DailyWelfare/images/bg.png
  11. BIN
      FGUIProject/assets/DailyWelfare/images/flower.png
  12. BIN
      FGUIProject/assets/DailyWelfare/images/kuang.png
  13. BIN
      FGUIProject/assets/DailyWelfare/images/top_line.png
  14. 5 0
      FGUIProject/assets/DailyWelfare/package.xml
  15. 0 3
      FGUIProject/assets/Main/MainUI.xml
  16. 2 2
      FGUIProject/assets/Main/StoryFightTargetScoreUI.xml
  17. 7 6
      FGUIProject/assets/Store/components/Button10.xml
  18. BIN
      FGUIProject/assets/Store/imagesNew/bt_buy.png
  19. BIN
      FGUIProject/assets/Store/imagesNew/bt_cut.png
  20. BIN
      FGUIProject/assets/Store/imagesNew/bt_get1.png
  21. 6 6
      GameClient/Assets/Game/HotUpdate/Constant/ConstSortingOrder.cs
  22. 1 2
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  23. 1 0
      GameClient/Assets/Game/HotUpdate/Controller/LoginController.cs
  24. 1 1
      GameClient/Assets/Game/HotUpdate/Data/BattlePassTaskDataManager.cs
  25. 1 2
      GameClient/Assets/Game/HotUpdate/Data/CustomSuitDataManager.cs
  26. 1 1
      GameClient/Assets/Game/HotUpdate/Data/FightDataManager.cs
  27. 1 1
      GameClient/Assets/Game/HotUpdate/Data/PhotographUtil.cs
  28. 27 11
      GameClient/Assets/Game/HotUpdate/DressUp/DressUpUtil.cs
  29. 4 0
      GameClient/Assets/Game/HotUpdate/DressUp/MyDressUpHelper.cs
  30. 18 6
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignUI.cs
  31. 3 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListSignItem.cs
  32. 9 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ProgressBar1.cs
  33. 0 74
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_comPro.cs
  34. 0 11
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_comPro.cs.meta
  35. 0 4
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Main/UI_MainUI.cs
  36. 0 24
      GameClient/Assets/Game/HotUpdate/Platform/QDBiliBiliManager.cs
  37. 0 11
      GameClient/Assets/Game/HotUpdate/Platform/QDBiliBiliManager.cs.meta
  38. 0 154
      GameClient/Assets/Game/HotUpdate/Platform/QDHYKBManager.cs
  39. 0 11
      GameClient/Assets/Game/HotUpdate/Platform/QDHYKBManager.cs.meta
  40. 34 25
      GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs
  41. 0 173
      GameClient/Assets/Game/HotUpdate/Platform/QDTapTapManager.cs
  42. 0 11
      GameClient/Assets/Game/HotUpdate/Platform/QDTapTapManager.cs.meta
  43. 5 1
      GameClient/Assets/Game/HotUpdate/Utils/ResPathUtil.cs
  44. 6 0
      GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs
  45. 64 5
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs
  46. 1 1
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs
  47. 1 1
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs
  48. 4 69
      GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs
  49. 5 4
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs
  50. 8 8
      GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs
  51. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Store/StoreMonthView.cs
  52. 0 8
      GameClient/Assets/Game/HotUpdate/com.meta
  53. 0 8
      GameClient/Assets/Game/HotUpdate/com/bilibili.meta
  54. 0 317
      GameClient/Assets/Game/HotUpdate/com/bilibili/GSCCallbackListerner.cs
  55. 0 11
      GameClient/Assets/Game/HotUpdate/com/bilibili/GSCCallbackListerner.cs.meta
  56. 0 346
      GameClient/Assets/Game/HotUpdate/com/bilibili/GSCSdkInterface.cs
  57. 0 11
      GameClient/Assets/Game/HotUpdate/com/bilibili/GSCSdkInterface.cs.meta
  58. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839.meta
  59. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk.meta
  60. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives.meta
  61. 0 58
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/HykbGameArchives.cs
  62. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/HykbGameArchives.cs.meta
  63. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/bean.meta
  64. 0 140
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/bean/GameArchivesDataBean.cs
  65. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/bean/GameArchivesDataBean.cs.meta
  66. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener.meta
  67. 0 53
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbLoadArchivesListener.cs
  68. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbLoadArchivesListener.cs.meta
  69. 0 50
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbReadArchivesListener.cs
  70. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbReadArchivesListener.cs.meta
  71. 0 48
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbSaveArchivesListener.cs
  72. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/archives/listener/HykbSaveArchivesListener.cs.meta
  73. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs.meta
  74. 0 168
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/HykbAuxsSDK.cs
  75. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/HykbAuxsSDK.cs.meta
  76. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean.meta
  77. 0 77
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean/HykbActivationUiInfo.cs
  78. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean/HykbActivationUiInfo.cs.meta
  79. 0 79
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean/HykbGiftUiInfo.cs
  80. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/bean/HykbGiftUiInfo.cs.meta
  81. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener.meta
  82. 0 33
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxActivationCheckListener.cs
  83. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxActivationCheckListener.cs.meta
  84. 0 36
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxActivationListener.cs
  85. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxActivationListener.cs.meta
  86. 0 38
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxGiftListener.cs
  87. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxGiftListener.cs.meta
  88. 0 36
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxInitListener.cs
  89. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbAuxInitListener.cs.meta
  90. 0 50
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxActivationListener.cs
  91. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxActivationListener.cs.meta
  92. 0 51
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxGiftListener.cs
  93. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxGiftListener.cs.meta
  94. 0 50
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxInitListener.cs
  95. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/auxs/listener/HykbV2AuxInitListener.cs.meta
  96. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/common.meta
  97. 0 64
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/common/HykbContext.cs
  98. 0 11
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/common/HykbContext.cs.meta
  99. 0 8
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login.meta
  100. 0 124
      GameClient/Assets/Game/HotUpdate/com/m3839/sdk/login/HykbLogin.cs

+ 2 - 2
FGUIProject/assets/ClothingDecompose/ClothingDecomposeUI.xml

@@ -10,7 +10,7 @@
     </image>
     <image id="n22_qyr6" name="n22" src="qyr6n" fileName="images/fzfj_erdituditu.png" xy="72,406"/>
     <component id="n28_cb92" name="valueBar" src="v3541v" fileName="components/ComponentValueBar.xml" pkg="eg2y0ldp" xy="0,95" controller="c1,7"/>
-    <component id="n0_wlc2" name="btnBack" src="9xlo8" fileName="components/ButtonBack1.xml" pkg="eg2y0ldp" xy="35,80"/>
+    <component id="n0_wlc2" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="35,80"/>
     <component id="n1_wlc2" name="btnRule" src="wlc21" fileName="components/Button1.xml" xy="975,194"/>
     <list id="n29_ez2u" name="listTab" xy="100,343" size="880,63" layout="row" overflow="scroll" scroll="horizontal" scrollBarFlags="2" colGap="12">
       <item url="ui://h9mv1l71wlc22" icon="ui://h9mv1l71qyr6j" selectedIcon="ui://h9mv1l71qyr6e"/>
@@ -35,7 +35,7 @@
     <component id="n16_wlc2" name="btnDecompose" src="wonody" fileName="components/Button19.xml" pkg="mk0fwx0x" xy="368,1553">
       <Button title="分解"/>
     </component>
-    <text id="n17_wlc2" name="txtConsume" xy="440,1506" pivot="0.5,0" size="199,41" fontSize="30" color="#da826e" align="center" text="消耗金币X200">
+    <text id="n17_wlc2" name="txtConsume" xy="445,1506" pivot="0.5,0" size="188,41" fontSize="30" color="#da826e" align="center" text="消耗金币X200">
       <relation target="" sidePair="center-center"/>
     </text>
     <text id="n18_wlc2" name="txtTips" xy="254,1660" size="571,44" fontSize="26" color="#bbafa3" align="center" autoSize="none" text="服装会自动保留一件不显示在列表中"/>

+ 61 - 10
FGUIProject/assets/DailyWelfare/DailySignUI.xml

@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1080,1865">
+<component size="1080,1865" opaque="false">
   <controller name="c1" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_qik1" name="n0" src="idkd1f" fileName="images/bg.png" xy="0,38"/>
-    <image id="n1_qik1" name="n1" src="qik1i" fileName="images/wz_yqd.png" xy="48,223"/>
-    <component id="n3_qik1" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="686,254" pivot="0.5,0" anchor="true">
-      <ProgressBar value="50" max="100"/>
-    </component>
-    <image id="n8_qik1" name="n8" src="qik1r" fileName="images/txz_lvl_db.png" xy="305,290"/>
-    <text id="n2_qik1" name="txtMonth" xy="47,254" pivot="1,1" size="148,94" font="ui://eg2y0ldpa0cftkz" fontSize="72" color="#fffdf9" text="时期">
+    <component id="n13_idkd" name="comBg" src="idkd1k" fileName="components/ComSignBg.xml" xy="0,95" size="1080,1735"/>
+    <image id="n10_idkd" name="n10" src="idkd1j" fileName="images/top_line.png" xy="544,0"/>
+    <component id="n12_idkd" name="comTop" src="idkd1l" fileName="components/ComSignTop.xml" xy="54,229" size="971,213"/>
+    <image id="n11_idkd" name="n11" src="idkd1h" fileName="images/flower.png" xy="0,54"/>
+    <image id="n1_qik1" name="n1" src="idkd19" fileName="images/t_k2.png" xy="115,257" pivot="0.5,0.5" group="n20_idkd"/>
+    <image id="n14_idkd" name="n14" src="idkd18" fileName="images/t_k1.png" xy="85,232" pivot="0.5,0.5" group="n20_idkd"/>
+    <image id="n15_idkd" name="n15" src="idkd1a" fileName="images/t_kuai.png" xy="108,254" pivot="0.5,0.5" size="163,163" group="n20_idkd"/>
+    <image id="n16_idkd" name="n16" src="idkd1b" fileName="images/t_moon.png" xy="110,274" pivot="0.5,0.5" group="n20_idkd"/>
+    <image id="n17_idkd" name="n17" src="idkd1e" fileName="images/t3.png" xy="132,354" group="n20_idkd"/>
+    <image id="n18_idkd" name="n18" src="idkd17" fileName="images/t4.png" xy="193,352" group="n20_idkd"/>
+    <image id="n19_idkd" name="n19" src="idkd1d" fileName="images/t2.png" xy="196,292" group="n20_idkd"/>
+    <text id="n2_qik1" name="txtMonth" xy="195,348" pivot="1,1" anchor="true" size="148,94" group="n20_idkd" font="ui://eg2y0ldpa0cftkz" fontSize="72" color="#fffdf9" text="时期">
       <gearFontSize controller="c1" pages="0" values="72" default="50"/>
     </text>
-    <text id="n4_qik1" name="txtSignCount" xy="346,325" pivot="0.5,0" size="43,54" fontSize="40" color="#643323" text="30"/>
+    <group id="n20_idkd" name="n20" xy="47,232" size="244,206"/>
+    <component id="n3_qik1" name="proSign" src="fqor7" fileName="components/ProgressBar1.xml" xy="693,271" pivot="0.5,0" anchor="true" size="622,161">
+      <ProgressBar value="1" max="100"/>
+    </component>
+    <graph id="n21_idkd" name="holderRole" xy="884,1500" size="10,10" touchable="false"/>
     <list id="n5_qik1" name="list" xy="60,455" size="967,1276" layout="flow_hz" lineGap="2" colGap="2" defaultItem="ui://t8nwuj7ifqor9" align="center" autoClearItems="true">
       <item/>
       <item/>
@@ -46,6 +55,48 @@
       <item/>
     </list>
     <component id="n9_qik1" name="btnClose" src="a0cftl2" fileName="components/BtnClose.xml" pkg="eg2y0ldp" xy="495,1769"/>
+    <graph id="n22_idkd" name="holderFlower" xy="535,484" size="10,10" touchable="false"/>
+    <graph id="n24_idkd" name="holderLizi" xy="522,670" size="10,10" touchable="false"/>
   </displayList>
-  <transition name="t0"/>
+  <transition name="t0">
+    <item time="0" type="Alpha" target="n11_idkd" tween="true" startValue="0" endValue="1" duration="24" ease="Linear"/>
+    <item time="0" type="Alpha" target="n12_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n13_idkd" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="0" type="Alpha" target="n14_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n15_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n16_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n17_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n18_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n19_idkd" value="0"/>
+    <item time="0" type="Alpha" target="n1_qik1" value="0"/>
+    <item time="0" type="Alpha" target="n2_qik1" value="0"/>
+    <item time="0" type="Alpha" target="n3_qik1" value="0"/>
+    <item time="0" type="Alpha" target="n5_qik1" value="0"/>
+    <item time="0" type="Size" target="n12_idkd" value="0,213"/>
+    <item time="0" type="Size" target="n13_idkd" tween="true" startValue="1080,0" endValue="1080,1735" duration="12" ease="Linear"/>
+    <item time="0" type="Visible" target="n21_idkd" value="false"/>
+    <item time="0" type="Visible" target="n9_qik1" value="false"/>
+    <item time="0" type="XY" target="n16_idkd" value="140,285"/>
+    <item time="6" type="Alpha" target="n12_idkd" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
+    <item time="6" type="Alpha" target="n2_qik1" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="6" type="Size" target="n12_idkd" tween="true" startValue="0,213" endValue="971,213" duration="12" ease="Linear"/>
+    <item time="6" type="XY" target="n2_qik1" tween="true" startValue="222,375" endValue="195,348" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n14_idkd" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n15_idkd" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n16_idkd" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n17_idkd" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n18_idkd" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n19_idkd" tween="true" startValue="0" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="Alpha" target="n1_qik1" tween="true" startValue="0" endValue="0" duration="6" ease="Linear"/>
+    <item time="9" type="Rotation" target="n14_idkd" tween="true" startValue="-10" endValue="0" duration="6" ease="Linear"/>
+    <item time="9" type="Rotation" target="n1_qik1" tween="true" startValue="10" endValue="1" duration="6" ease="Linear"/>
+    <item time="9" type="XY" target="n16_idkd" tween="true" startValue="140,285" endValue="110,274" duration="6" ease="Linear"/>
+    <item time="9" type="XY" target="n17_idkd" tween="true" startValue="145,339" endValue="131,354" duration="6" ease="Linear"/>
+    <item time="9" type="XY" target="n18_idkd" tween="true" startValue="203,338" endValue="193,352" duration="6" ease="Linear"/>
+    <item time="9" type="XY" target="n19_idkd" tween="true" startValue="182,306" endValue="196,292" duration="6" ease="Linear"/>
+    <item time="12" type="Alpha" target="n3_qik1" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
+    <item time="12" type="Alpha" target="n5_qik1" tween="true" startValue="0" endValue="1" duration="12" ease="Linear"/>
+    <item time="12" type="Visible" target="n9_qik1" value="true"/>
+    <item time="18" type="Visible" target="n21_idkd" value="true"/>
+  </transition>
 </component>

+ 1 - 1
FGUIProject/assets/DailyWelfare/components/ComProBonus.xml

@@ -3,7 +3,7 @@
   <displayList>
     <image id="n18_qik1" name="n18" src="qik1g" fileName="images/qrhd_jd_fgx1.png" xy="33,76" group="n13_fqor"/>
     <image id="n16_qik1" name="n16" src="qik1f" fileName="images/mrrw_jl_db.png" xy="0,0" group="n13_fqor"/>
-    <loader id="n14_fqor" name="loaIcon" xy="11,12" pivot="0.5,0.5" size="58,58" group="n13_fqor" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale" clearOnPublish="true"/>
+    <loader id="n14_fqor" name="loaIcon" xy="5,6" pivot="0.5,0.5" size="70,70" group="n13_fqor" aspect="true" url="ui://eg2y0ldpu2u3tkq" fill="scale" clearOnPublish="true"/>
     <image id="n17_qik1" name="n17" src="qik1d" fileName="images/mrqd_sz_db.png" xy="34,57" group="n13_fqor"/>
     <text id="n15_fqor" name="txtCount" xy="35,46" pivot="0.5,0" size="45,39" group="n13_fqor" fontSize="28" color="#ffffff" align="center" autoClearText="true" text="000"/>
     <text id="n12_fqor" name="txtDay" xy="39,103" pivot="0.5,0" anchor="true" size="35,44" group="n13_fqor" fontSize="32" color="#643323" align="center" text="30"/>

+ 6 - 0
FGUIProject/assets/DailyWelfare/components/ComSignBg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1080,1735" overflow="hidden" opaque="false">
+  <displayList>
+    <image id="n14_idkd" name="n14" src="idkd1f" fileName="images/bg.png" xy="0,0"/>
+  </displayList>
+</component>

+ 6 - 0
FGUIProject/assets/DailyWelfare/components/ComSignTop.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="971,213" overflow="hidden">
+  <displayList>
+    <image id="n12_idkd" name="n12" src="idkd1i" fileName="images/kuang.png" xy="0,0"/>
+  </displayList>
+</component>

+ 1 - 1
FGUIProject/assets/DailyWelfare/components/ListChargeItem.xml

@@ -8,7 +8,7 @@
   <displayList>
     <image id="n2_mbf1" name="n2" src="uxxstmj" fileName="imagesNew/mrrw_db.png" pkg="eg2y0ldp" xy="0,0"/>
     <image id="n9_idkd" name="n9" src="uxxstmq" fileName="imagesNew/mrrw_bq_qb.png" pkg="eg2y0ldp" xy="37,5"/>
-    <list id="n3_mbf1" name="listRewards" xy="99,64" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
+    <list id="n3_mbf1" name="listRewards" xy="99,65" size="320,131" layout="row" colGap="6" defaultItem="ui://eg2y0ldp9jv6tls">
       <item/>
       <item/>
     </list>

+ 3 - 2
FGUIProject/assets/DailyWelfare/components/ListSignItem.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="155,200">
-  <controller name="c1" pages="0,,1,,2," selected="2">
+  <controller name="c1" pages="0,,1,,2," selected="0">
     <remark page="1" value="金卡"/>
     <remark page="2" value="黑金"/>
   </controller>
   <displayList>
     <image id="n23_qik1" name="n23" src="qik1j" fileName="images/yqd_mr_db.png" xy="-2,0" group="n20_fqor"/>
-    <loader id="n15_fqor" name="loaDoubleTag" xy="8,164" pivot="0.5,0" size="139,29" group="n20_fqor" url="ui://t8nwuj7iqik1h" autoSize="true">
+    <loader id="n15_fqor" name="loaDoubleTag" xy="8,164" pivot="0.5,0" size="139,29" group="n20_fqor" autoSize="true">
       <gearIcon controller="c1" pages="0,1,2" values="|ui://t8nwuj7iqik1s|ui://t8nwuj7iqik1h"/>
     </loader>
     <component id="n21_qik1" name="comItem" src="9jv6tls" fileName="components/ComItemNew.xml" pkg="eg2y0ldp" xy="15,40" group="n20_fqor"/>
@@ -15,5 +15,6 @@
     <image id="n18_fqor" name="imgGot" src="qik1k" fileName="images/yz_yhd.png" xy="17,64" group="n20_fqor"/>
     <image id="n19_fqor" name="imgNotGet" src="qik1o" fileName="images/mrqd_kbq.png" xy="-8,45" group="n20_fqor"/>
     <group id="n20_fqor" name="grpItem" xy="-8,-3" size="205,208" advanced="true"/>
+    <graph id="n24_idkd" name="holderSign" xy="80,103" size="10,10" touchable="false"/>
   </displayList>
 </component>

+ 10 - 7
FGUIProject/assets/DailyWelfare/components/ProgressBar1.xml

@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="620,140" overflow="hidden" extention="ProgressBar">
+<component size="622,161" extention="ProgressBar">
   <displayList>
-    <image id="n8_idkd" name="n8" src="qik1m" fileName="images/mrqd_jdt_db.png" xy="0,95" size="620,23">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <component id="n0_fqor" name="n0" src="idkd1g" fileName="components/comPro.xml" xy="0,95"/>
+    <image id="n8_idkd" name="n8" src="qik1m" fileName="images/mrqd_jdt_db.png" xy="0,95" group="n13_idkd"/>
+    <image id="n14_idkd" name="bar" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,99" group="n13_idkd" fillMethod="hz"/>
     <component id="n2_fqor" name="comProBonus0" src="fqor8" fileName="components/ComProBonus.xml" xy="95,70" group="n7_fqor"/>
     <component id="n3_fqor" name="comProBonus1" src="fqor8" fileName="components/ComProBonus.xml" xy="205,70" group="n7_fqor"/>
     <component id="n4_fqor" name="comProBonus2" src="fqor8" fileName="components/ComProBonus.xml" xy="315,70" group="n7_fqor"/>
     <component id="n5_fqor" name="comProBonus3" src="fqor8" fileName="components/ComProBonus.xml" xy="425,70" group="n7_fqor"/>
     <component id="n6_fqor" name="comProBonus4" src="fqor8" fileName="components/ComProBonus.xml" xy="535,70" group="n7_fqor"/>
-    <group id="n7_fqor" name="n7" xy="55,0" size="520,140" advanced="true"/>
-    <graph id="n9_idkd" name="ani" xy="608,56" pivot="0.5,0.5" anchor="true" size="10,10" type="rect" lineSize="0"/>
+    <group id="n7_fqor" name="n7" xy="55,0" size="520,140" group="n13_idkd" advanced="true"/>
+    <graph id="n9_idkd" name="holder" xy="536,106" pivot="0.5,0.5" anchor="true" size="10,10" group="n13_idkd" touchable="false" lineSize="0"/>
+    <graph id="n15_idkd" name="holderReward" xy="425,34" size="10,10" group="n13_idkd" touchable="false"/>
+    <group id="n13_idkd" name="n13" xy="0,0" size="620,140"/>
+    <image id="n10_idkd" name="n10" src="qik1r" fileName="images/txz_lvl_db.png" xy="-90,38" group="n12_idkd"/>
+    <text id="n11_idkd" name="txtSignCount" xy="-49,73" pivot="0.5,0" size="43,54" group="n12_idkd" fontSize="40" color="#643323" text="30"/>
+    <group id="n12_idkd" name="n12" xy="-90,38" size="123,123"/>
   </displayList>
   <ProgressBar/>
 </component>

+ 0 - 1
FGUIProject/assets/DailyWelfare/components/comPro.xml

@@ -3,6 +3,5 @@
   <displayList>
     <image id="n1_fqor" name="bar" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,5" fillMethod="hz"/>
     <image id="n3_idkd" name="n3" src="qik1n" fileName="images/mrqd_jdt_yellow.png" xy="5,5" fillMethod="hz"/>
-    <graph id="n2_idkd" name="ani" xy="614,12" pivot="0.5,0.5" anchor="true" size="10,10" type="rect" lineSize="0"/>
   </displayList>
 </component>

BIN
FGUIProject/assets/DailyWelfare/images/bg.png


BIN
FGUIProject/assets/DailyWelfare/images/flower.png


BIN
FGUIProject/assets/DailyWelfare/images/kuang.png


BIN
FGUIProject/assets/DailyWelfare/images/top_line.png


+ 5 - 0
FGUIProject/assets/DailyWelfare/package.xml

@@ -55,6 +55,11 @@
     <image id="idkd1e" name="t3.png" path="/images/"/>
     <image id="idkd1f" name="bg.png" path="/images/"/>
     <component id="idkd1g" name="comPro.xml" path="/components/"/>
+    <image id="idkd1h" name="flower.png" path="/images/"/>
+    <image id="idkd1i" name="kuang.png" path="/images/"/>
+    <image id="idkd1j" name="top_line.png" path="/images/"/>
+    <component id="idkd1k" name="ComSignBg.xml" path="/components/"/>
+    <component id="idkd1l" name="ComSignTop.xml" path="/components/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/DailyWelfare" packageCount="2" genCode="true"/>
 </packageDescription>

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

@@ -6,9 +6,6 @@
       <relation target="" sidePair="bottom-bottom"/>
     </image>
     <component id="n61_r9ri" name="headBar" src="slb416" fileName="components/ComponentHeadBar.xml" xy="34,160" group="n52_qqat"/>
-    <component id="n46_lh8v" name="btnDailyLogin" src="ox5bf5" fileName="components/Button2.xml" xy="24,305" group="n52_qqat" visible="false">
-      <relation target="" sidePair="left-left,top-top"/>
-    </component>
     <component id="n74_fqor" name="btnDailyWelfare" src="ox5bf5" fileName="components/Button2.xml" xy="18,457" group="n52_qqat" visible="false">
       <relation target="" sidePair="left-left,top-top"/>
       <Button title="福利大厅"/>

+ 2 - 2
FGUIProject/assets/Main/StoryFightTargetScoreUI.xml

@@ -15,8 +15,8 @@
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <Button title="x1" icon="ui://mfvz4q8kt31nj8"/>
     </component>
-    <component id="n51_psph" name="myHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-25,169"/>
-    <component id="n52_psph" name="targetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="879,175"/>
+    <component id="n51_psph" name="myHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="-25,169" visible="false"/>
+    <component id="n52_psph" name="targetHead" src="r9ri1h" fileName="components/ComHead.xml" pkg="eg2y0ldp" xy="879,175" visible="false"/>
     <component id="n28_uj53" name="proScore" src="v3k9c7" fileName="components/ProgressBarTargetScore.xml" xy="170,127" pivot="0,0.5" anchor="true">
       <ProgressBar value="100" max="100"/>
     </component>

+ 7 - 6
FGUIProject/assets/Store/components/Button10.xml

@@ -3,14 +3,15 @@
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
     <image id="n10_qik1" name="n10" src="hhx91d" fileName="imagesNew/bt_buy.png" xy="0,5"/>
-    <text id="n5_l500" name="txtOriginalPrice" xy="33,16" pivot="0.5,0" size="50,44" group="n7_l500" fontSize="32" color="#725e41" align="center" text="999"/>
-    <image id="n6_l500" name="n6" src="fqortas" fileName="imagesNew/sc_jinxiexian.png" xy="28,35" pivot="0.5,0" group="n7_l500">
+    <text id="n11_idkd" name="n11" xy="15,11" pivot="0.5,0.5" size="42,52" group="n8_l500" fontSize="38" color="#5a3e16" text="¥"/>
+    <text id="n5_l500" name="txtOriginalPrice" xy="58,16" pivot="0.5,0" size="50,44" group="n7_l500" fontSize="32" color="#725e41" align="center" text="999"/>
+    <image id="n6_l500" name="n6" src="fqortas" fileName="imagesNew/sc_jinxiexian.png" xy="53,35" pivot="0.5,0" group="n7_l500">
       <relation target="n5_l500" sidePair="width-width"/>
     </image>
-    <group id="n7_l500" name="grpOriginalPrice" xy="28,16" size="60,44" group="n8_l500" advanced="true"/>
-    <text id="n4_l500" name="txtPrice" xy="90,10" size="43,54" group="n8_l500" fontSize="40" color="#5a3e16" text="99"/>
-    <text id="n9_l500" name="title" xy="135,9" size="84,54" group="n8_l500" fontSize="40" color="#5a3e16" align="center" text="购买"/>
-    <group id="n8_l500" name="n8" xy="28,9" size="191,55" advanced="true" layout="hz" colGap="2" excludeInvisibles="true">
+    <group id="n7_l500" name="grpOriginalPrice" xy="53,16" size="60,44" group="n8_l500" advanced="true"/>
+    <text id="n4_l500" name="txtPrice" xy="109,10" size="43,54" group="n8_l500" fontSize="40" color="#5a3e16" text="99"/>
+    <text id="n9_l500" name="title" xy="148,9" size="84,54" group="n8_l500" fontSize="40" color="#5a3e16" align="center" text="购买"/>
+    <group id="n8_l500" name="n8" xy="15,9" size="217,55" advanced="true" layout="hz" colGap="-4" excludeInvisibles="true">
       <relation target="" sidePair="center-center"/>
     </group>
   </displayList>

BIN
FGUIProject/assets/Store/imagesNew/bt_buy.png


BIN
FGUIProject/assets/Store/imagesNew/bt_cut.png


BIN
FGUIProject/assets/Store/imagesNew/bt_get1.png


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

+ 1 - 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"));

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

+ 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/FightDataManager.cs

@@ -89,7 +89,7 @@ namespace GFGGame
                 StorageSProxy.ReqSetClientValue(ConstStorageId.STORAGE_AUTO_PLAY, _autoPlay == true ? 1 : 0).Coroutine();
             }
         }
-        public int maxFightSpeed = 4;
+        public int maxFightSpeed = 2;
         private int _fightSpeed = 1;
         public int fightSpeed
         {

+ 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;

+ 18 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_DailySignUI.cs

@@ -8,11 +8,15 @@ namespace UI.DailyWelfare
     {
         public GComponent target;
         public Controller m_c1;
-        public UI_ProgressBar1 m_proSign;
+        public GComponent m_comBg;
+        public GComponent m_comTop;
         public GTextField m_txtMonth;
-        public GTextField m_txtSignCount;
+        public UI_ProgressBar1 m_proSign;
+        public GGraph m_holderRole;
         public GList m_list;
         public GButton m_btnClose;
+        public GGraph m_holderFlower;
+        public GGraph m_holderLizi;
         public Transition m_t0;
         public const string URL = "ui://t8nwuj7iqik1q";
         public const string PACKAGE_NAME = "DailyWelfare";
@@ -62,22 +66,30 @@ namespace UI.DailyWelfare
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
-            m_proSign = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proSign"));
+            m_comBg = (GComponent)comp.GetChild("comBg");
+            m_comTop = (GComponent)comp.GetChild("comTop");
             m_txtMonth = (GTextField)comp.GetChild("txtMonth");
-            m_txtSignCount = (GTextField)comp.GetChild("txtSignCount");
+            m_proSign = (UI_ProgressBar1)UI_ProgressBar1.Create(comp.GetChild("proSign"));
+            m_holderRole = (GGraph)comp.GetChild("holderRole");
             m_list = (GList)comp.GetChild("list");
             m_btnClose = (GButton)comp.GetChild("btnClose");
+            m_holderFlower = (GGraph)comp.GetChild("holderFlower");
+            m_holderLizi = (GGraph)comp.GetChild("holderLizi");
             m_t0 = comp.GetTransition("t0");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_comBg = null;
+            m_comTop = null;
+            m_txtMonth = null;
             m_proSign.Dispose();
             m_proSign = null;
-            m_txtMonth = null;
-            m_txtSignCount = null;
+            m_holderRole = null;
             m_list = null;
             m_btnClose = null;
+            m_holderFlower = null;
+            m_holderLizi = null;
             m_t0 = null;
             if(disposeTarget && target != null)
             {

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ListSignItem.cs

@@ -15,6 +15,7 @@ namespace UI.DailyWelfare
         public GImage m_imgGot;
         public GImage m_imgNotGet;
         public GGroup m_grpItem;
+        public GGraph m_holderSign;
         public const string URL = "ui://t8nwuj7ifqor9";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ListSignItem";
@@ -70,6 +71,7 @@ namespace UI.DailyWelfare
             m_imgGot = (GImage)comp.GetChild("imgGot");
             m_imgNotGet = (GImage)comp.GetChild("imgNotGet");
             m_grpItem = (GGroup)comp.GetChild("grpItem");
+            m_holderSign = (GGraph)comp.GetChild("holderSign");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -81,6 +83,7 @@ namespace UI.DailyWelfare
             m_imgGot = null;
             m_imgNotGet = null;
             m_grpItem = null;
+            m_holderSign = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 9 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_ProgressBar1.cs

@@ -12,6 +12,9 @@ namespace UI.DailyWelfare
         public UI_ComProBonus m_comProBonus2;
         public UI_ComProBonus m_comProBonus3;
         public UI_ComProBonus m_comProBonus4;
+        public GGraph m_holder;
+        public GGraph m_holderReward;
+        public GTextField m_txtSignCount;
         public const string URL = "ui://t8nwuj7ifqor7";
         public const string PACKAGE_NAME = "DailyWelfare";
         public const string RES_NAME = "ProgressBar1";
@@ -64,6 +67,9 @@ namespace UI.DailyWelfare
             m_comProBonus2 = (UI_ComProBonus)UI_ComProBonus.Create(comp.GetChild("comProBonus2"));
             m_comProBonus3 = (UI_ComProBonus)UI_ComProBonus.Create(comp.GetChild("comProBonus3"));
             m_comProBonus4 = (UI_ComProBonus)UI_ComProBonus.Create(comp.GetChild("comProBonus4"));
+            m_holder = (GGraph)comp.GetChild("holder");
+            m_holderReward = (GGraph)comp.GetChild("holderReward");
+            m_txtSignCount = (GTextField)comp.GetChild("txtSignCount");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -77,6 +83,9 @@ namespace UI.DailyWelfare
             m_comProBonus3 = null;
             m_comProBonus4.Dispose();
             m_comProBonus4 = null;
+            m_holder = null;
+            m_holderReward = null;
+            m_txtSignCount = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 0 - 74
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_comPro.cs

@@ -1,74 +0,0 @@
-/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
-
-using FairyGUI;
-
-namespace UI.DailyWelfare
-{
-    public partial class UI_comPro
-    {
-        public GComponent target;
-        public GImage m_bar;
-        public GGraph m_ani;
-        public const string URL = "ui://t8nwuj7iidkd1g";
-        public const string PACKAGE_NAME = "DailyWelfare";
-        public const string RES_NAME = "comPro";
-        private static UI_comPro _proxy;
-
-        public static UI_comPro Create(GObject gObject = null)
-        {
-            var ui = new UI_comPro();
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static UI_comPro Proxy(GObject gObject = null)
-        {
-            if(_proxy == null)
-            {
-                _proxy = new UI_comPro();
-            }
-            var ui = _proxy;
-            if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
-            else
-            	ui.target =  (GComponent)gObject;
-            ui.Init(ui.target);
-            return ui;
-        }
-
-        public static void ProxyEnd()
-        {
-            if (_proxy != null)
-            {
-                _proxy.Dispose();
-            }
-        }
-
-        public static void ClearProxy()
-        {
-            ProxyEnd();
-            _proxy = null;
-        }
-
-        private void Init(GComponent comp)
-        {
-            m_bar = (GImage)comp.GetChild("bar");
-            m_ani = (GGraph)comp.GetChild("ani");
-        }
-        public void Dispose(bool disposeTarget = false)
-        {
-            m_bar = null;
-            m_ani = null;
-            if(disposeTarget && target != null)
-            {
-                target.RemoveFromParent();
-                target.Dispose();
-            }
-            target = null;
-        }
-    }
-}

+ 0 - 11
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/DailyWelfare/UI_comPro.cs.meta

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

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

@@ -9,7 +9,6 @@ namespace UI.Main
         public GComponent target;
         public GComponent m_valueBar;
         public UI_ComponentHeadBar m_headBar;
-        public UI_Button2 m_btnDailyLogin;
         public UI_Button2 m_btnDailyWelfare;
         public UI_Button4 m_btnActivityLuckyBox;
         public UI_ButtonModle1 m_btnMain;
@@ -87,7 +86,6 @@ namespace UI.Main
         {
             m_valueBar = (GComponent)comp.GetChild("valueBar");
             m_headBar = (UI_ComponentHeadBar)UI_ComponentHeadBar.Create(comp.GetChild("headBar"));
-            m_btnDailyLogin = (UI_Button2)UI_Button2.Create(comp.GetChild("btnDailyLogin"));
             m_btnDailyWelfare = (UI_Button2)UI_Button2.Create(comp.GetChild("btnDailyWelfare"));
             m_btnActivityLuckyBox = (UI_Button4)UI_Button4.Create(comp.GetChild("btnActivityLuckyBox"));
             m_btnMain = (UI_ButtonModle1)UI_ButtonModle1.Create(comp.GetChild("btnMain"));
@@ -122,8 +120,6 @@ namespace UI.Main
             m_valueBar = null;
             m_headBar.Dispose();
             m_headBar = null;
-            m_btnDailyLogin.Dispose();
-            m_btnDailyLogin = null;
             m_btnDailyWelfare.Dispose();
             m_btnDailyWelfare = null;
             m_btnActivityLuckyBox.Dispose();

+ 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: 

+ 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")

+ 6 - 0
GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -231,6 +231,12 @@ namespace GFGGame
             _ui.m_listReward.numItems = _decomposeCount > 0 ? cfg.itemsArr.Length : 0;
             _ui.m_txtShow.text = string.Format("*  分解{0}件{1}可获得  *", StringUtil.GetColorText(_decomposeCount.ToString(), "#DA826E"), ConstDressRarity.DressRarityList()[_curRarity]);
             ET.Log.Debug("分解消耗:  " + cfg.consumeId + "   找不到物品配置");
+            if (itemCfg == null)
+            {
+                _ui.m_txtConsume.visible = false;
+                return;
+            }
+            _ui.m_txtConsume.visible = true;
             _ui.m_txtConsume.text = string.Format("消耗{0}X{1}", itemCfg.name, (_decomposeCount * cfg.consumeCount));
         }
         private void ListRewardItemRander(int index, GObject obj)

+ 64 - 5
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -11,15 +11,32 @@ namespace GFGGame
     public class DailySignView : BaseWindow
     {
         private UI_DailySignUI _ui;
-
-        private int _signCount;
+        private GameObject _gameObject0;
+        private GameObject _gameObject1;
+        private GameObject _gameObject2;
+        private GameObject _gameObject3;
+        private GameObject _gameObject4;
+        private GameObject _gameObject5;
+        private GoWrapper _wrapper0;
+        private GoWrapper _wrapper1;
+        private GoWrapper _wrapper2;
+        private GoWrapper _wrapper3;
+        private GoWrapper _wrapper4;
+        private GoWrapper _wrapper5;
+        private GGraph m_holderSign;
+        private float _signCount;
         private int _month;
         private int _day;
 
         public override void Dispose()
         {
             base.Dispose();
-
+            SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
+            SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
+            SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
+            SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
+            SceneController.DestroyObjectFromView(_gameObject4, _wrapper4);
+            SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
             if (_ui != null)
             {
                 _ui.Dispose();
@@ -40,6 +57,17 @@ namespace GFGGame
             _ui.m_btnClose.onClick.Add(Hide);
             _ui.m_list.itemRenderer = ListItemRender;
 
+
+            string resPath = ResPathUtil.GetViewEffectPath("ui_league", "Answer_bgtx");
+            SceneController.AddObjectToView(null, null, _ui.m_holderFlower, resPath, out _gameObject0, out _wrapper0);
+            string resPath1 = ResPathUtil.GetViewEffectPath("ui_Activity", "Everyday_2lizi");
+            SceneController.AddObjectToView(null, null, _ui.m_holderLizi, resPath1, out _gameObject1, out _wrapper1);
+            string resPath2 = ResPathUtil.GetViewEffectPath("ui_Activity", "Everydayy_people");
+            SceneController.AddObjectToView(null, null, _ui.m_holderRole, resPath2, out _gameObject2, out _wrapper2);
+
+            string resPath4 = ResPathUtil.GetViewEffectPath("ui_fight_new", "Progress_head");
+            SceneController.AddObjectToView(null, null, _ui.m_proSign.m_holder, resPath4, out _gameObject4, out _wrapper4, 90);
+
         }
         protected override void AddEventListener()
         {
@@ -50,15 +78,28 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
+            _ui.m_proSign.m_holder.visible = false;
+            _ui.m_t0.Play(() =>
+            {
+                _ui.m_proSign.m_holder.visible = true;
+                if (m_holderSign != null)
+                {
+                    m_holderSign.visible = true;
+                }
+            });
             _month = TimeUtil.GetCurMonth();
             _day = TimeUtil.GetCurDay();
             _ui.m_txtMonth.text = NumberUtil.GetOldChiniseNumberText(_month);
+
             UpdateSignView();
+
         }
 
         protected override void OnHide()
         {
             base.OnHide();
+            _ui.m_t0.Stop();
+            m_holderSign = null;
         }
         protected override void RemoveEventListener()
         {
@@ -69,11 +110,13 @@ namespace GFGGame
         private void UpdateSignView()
         {
             _signCount = MathHelper.CountOnes(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignDay));
-            _ui.m_txtSignCount.text = _signCount.ToString();
+            _ui.m_proSign.m_txtSignCount.text = _signCount.ToString();
             List<DailySignBonusCfg> signBonusCfgs = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month);
             _ui.m_proSign.target.max = signBonusCfgs.Count;
             _ui.m_proSign.target.value = _signCount;
+            _ui.m_proSign.m_holder.x = _signCount / signBonusCfgs.Count * _ui.m_proSign.target.width - 68;
             List<DailySignCfg> signCfgs = DailySignCfgArray.Instance.GetCfgsBymonth(_month);
+            _ui.m_proSign.m_holderReward.visible = false;
             for (int i = 0; i < signCfgs.Count; i++)
             {
                 GComponent comProBonus = _ui.m_proSign.target.GetChild("comProBonus" + i).asCom;
@@ -90,6 +133,16 @@ namespace GFGGame
                 bool isGot = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignReward), signCfgs[i].day);
                 item.m_imgGot.visible = isGot;
                 bool canGet = _signCount >= signCfgs[i].day && !isGot;
+                if (canGet)
+                {
+                    if (_gameObject5 == null)
+                    {
+                        string resPath5 = ResPathUtil.GetViewEffectPath("ui_Activity", "Everyday_enable");
+                        SceneController.AddObjectToView(null, null, _ui.m_proSign.m_holderReward, resPath5, out _gameObject5, out _wrapper5);
+                    }
+                    _ui.m_proSign.m_holderReward.visible = canGet;
+                    _ui.m_proSign.m_holderReward.position = new Vector2(item.target.x, 35);
+                }
                 RedDotController.Instance.SetComRedDot(item.target, canGet);
                 UI_ComProBonus.ProxyEnd();
             }
@@ -127,7 +180,13 @@ namespace GFGGame
             DailySignBonusCfg bonusCfg = DailySignBonusCfgArray.Instance.GetCfgsBymonth(_month)[_index];
             ItemCfg itemCfg = ItemCfgArray.Instance.GetCfg(bonusCfg.bonusArr[0][0]);
             bool isGot = MathHelper.isBitSet(GameGlobal.myNumericComponent.GetAsInt(NumericType.SignDay), bonusCfg.day);
-
+            if (bonusCfg.day == _day && !isGot && _gameObject3 == null)
+            {
+                string resPath3 = ResPathUtil.GetViewEffectPath("ui_Activity", "everyday_kuang");
+                SceneController.AddObjectToView(null, null, item.m_holderSign, resPath3, out _gameObject3, out _wrapper3);
+                m_holderSign = item.m_holderSign;
+            }
+            item.m_holderSign.visible = false;
             item.m_c1.selectedIndex = itemCfg.itemType == ConstItemType.DRESS_UP ? 0 : bonusCfg.type;
             item.m_txtDay.text = NumberUtil.GetChiniseNumberText(bonusCfg.day);//  bonusCfg.day.ToString();
             if (item.m_comItem.data == null)

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

@@ -87,7 +87,7 @@ namespace GFGGame
         }
         private void OnBtnLimitChargeAddUpClick()
         {
-            ViewManager.Show<LimitChargeView>(new object[] { typeof(DailyWelfareView).FullName, this.viewData });
+            ViewManager.Show<LimitChargeView>(null, new object[] { typeof(DailyWelfareView).FullName, this.viewData });
         }
         private void OnBtnSevenDayLoginClick()
         {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/LimitChargeView.cs

@@ -44,7 +44,7 @@ namespace GFGGame
         protected override void OnShown()
         {
             base.OnShown();
-            _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByid(ActivityDataManager.Instance.actLimitChargeId);
+            _rechargeCfgs = ActivityRechargeCfgArray.Instance.GetCfgsByactivityId(ActivityDataManager.Instance.actLimitChargeId);
             UpdateView();
             Timers.inst.Add(1, 0, UpdateTime);
         }

+ 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
             {

+ 5 - 4
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryFightTargetScoreView.cs

@@ -243,8 +243,7 @@ namespace GFGGame
             //     _ui.m_comClick.m_comAllPerfect.target.onTouchBegin.Add(OnComAllCircleClickBegin);
             //     _ui.m_comClick.m_comAllPerfect.target.onTouchEnd.Add(AllCircleScoreEnd);
             // }
-
-            CheckPartAllFightBegin();
+            Timers.inst.Add(1, 0, CheckGuide);
         }
         /****************************************************************************************************************/
         private void SkillScoreStart(int roleType, out int skillScore, out int targetSkillScore, out Dictionary<int, int> skillScoreDic, out bool showCard)
@@ -701,6 +700,7 @@ namespace GFGGame
             }
             else
             {
+                CheckPartAllFightBegin();
                 Timers.inst.Remove(CheckGuide);
             }
         }
@@ -711,10 +711,11 @@ namespace GFGGame
 
             // if (playStop)
             // {
-            //     GuideController.TryGuide(_ui.m_comMineCircle.target, ConstGuideId.TARGET_FIGHT, 1, "这里可以观察双方的分数计算。");
+            //    
             // }
             // GuideController.TryGuide(_ui.m_btnSkill0.target, ConstGuideId.TARGET_FIGHT, 2, "使用技能,可以增加胜出的几率哦,长按查看技能说明。");
-            // GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 2);
+            GuideController.TryGuide(_ui.m_proScore.target, ConstGuideId.TARGET_FIGHT, 1, "这里可以观察双方的分数计算。");
+            GuideController.TryCompleteGuide(ConstGuideId.TARGET_FIGHT, 1);
 
         }
     }

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

@@ -130,7 +130,7 @@ namespace GFGGame
             _ui.m_btnMain.target.onClick.Add(OnClickBtnMain);
             _ui.m_btnHuanZhuang.target.onClick.Add(OnClickBtnHuanZhuang);
             _ui.m_btnZhaiXing.target.onClick.Add(OnClickBtnZhaiXing);
-            _ui.m_btnDailyLogin.target.onClick.Add(OnClickBtnDailyLogin);
+            // _ui.m_btnDailyLogin.target.onClick.Add(OnClickBtnDailyLogin);
             _ui.m_btnXiuFang.target.onClick.Add(OnClickBtnXiuFang);
             _ui.m_btnCiPai.target.onClick.Add(OnClickBtnCiPai);
             _ui.m_btnStudio.target.onClick.Add(OnClickBtnStudio);
@@ -455,7 +455,7 @@ namespace GFGGame
         {
             // if (isOpen) return;
             // isOpen = true;
-            _ui.m_btnDailyLogin.m_holder.visible = true;
+            // _ui.m_btnDailyLogin.m_holder.visible = true;
             // Timers.inst.Add(effectTime, 1, (param) =>
             // {
             //     _ui.m_btnDailyLogin.m_holder.visible = false;
@@ -620,7 +620,7 @@ namespace GFGGame
         {
             ViewManager.Show<ActivityDay7View>(null, new[] { ViewName.MAINUI_VIEW, this.viewData });
         }
-        
+
         private void OnClickBtnFirstRecharge()
         {
             ViewManager.Show<FirstChargeBonusView>();
@@ -682,7 +682,7 @@ namespace GFGGame
                 UpdateRoleLvl();
                 CheckFunOpen();
             }
-            if((int)context.data == NumericType.FirstRechargeBonusStatus)
+            if ((int)context.data == NumericType.FirstRechargeBonusStatus)
             {
                 UpdateBtnFirstRecharge();
             }
@@ -718,8 +718,8 @@ namespace GFGGame
             _ui.m_btnArena.m_loaLockIcon.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(ArenaView).Name, false);
             _ui.m_btnActivityLuckyBox.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitLuckyBox) > 0;
 
-            _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
-            || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
+            // _ui.m_btnDailyLogin.target.visible = !(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false)
+            // || (ActivityDataManager.Instance.sevenDayLoginLoginId >= 7 && ActivityDataManager.Instance.sevenDayLoginBonusStatus == ConstBonusStatus.GOT));
 
             int actLimitChargeId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitChargeId);
             _ui.m_btnDailyWelfare.target.visible = actLimitChargeId > 0 ||
@@ -743,8 +743,8 @@ namespace GFGGame
         {
             RedDotController.Instance.SetComRedDot(_btnGongGao, RedDotDataManager.Instance.GetNoticeRed());
             RedDotController.Instance.SetComRedDot(_btnRenWu, RedDotDataManager.Instance.GetTaskRed());
-            RedDotController.Instance.SetComRedDot(_ui.m_btnDailyLogin.target,
-                RedDotDataManager.Instance.GetDailyLoginRed());
+            // RedDotController.Instance.SetComRedDot(_ui.m_btnDailyLogin.target,
+            // RedDotDataManager.Instance.GetDailyLoginRed());
             RedDotController.Instance.SetComRedDot(_btnYouJian, RedDotDataManager.Instance.GetMailRed());
             RedDotController.Instance.SetComRedDot(_btnTuJian,
                 RedDotDataManager.Instance.GetFieldGuideRed() || RedDotDataManager.Instance.GetTravelGuideRed());

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Store/StoreMonthView.cs

@@ -137,7 +137,7 @@ namespace GFGGame
             _ui.m_btnBuy.m_grpOriginalPrice.visible = isFirstBuy && shopCfg.oncePrice < shopCfg.price;
             int price = isFirstBuy ? shopCfg.oncePrice : shopCfg.price;
             _ui.m_btnBuy.m_txtPrice.text = price.ToString();
-            _ui.m_btnBuy.target.data = "";
+            _ui.m_btnBuy.target.data = monthCfg.shopId;
             _ui.m_txtTips.SetVar("value", (price * 10).ToString()).FlushVars();
             _ui.m_txtTips.SetVar("day", monthCfg.limitDays.ToString()).FlushVars();
 

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

Some files were not shown because too many files changed in this diff