Merge remote-tracking branch 'remotes/origin/guodong' into zhaoyang

# Conflicts:
#	GameClient/Assets/ResIn/Config/excelConfig.sqlite.bytes

GameClient/Assets/Game/HotUpdate/Data/RoleDataManager.cs

@@ -53,10 +53,6 @@ namespace GFGGame
             {
                 return GameGlobal.myNumericComponent.GetAsInt(NumericType.DiamondP);
             }
-            set
-            {
-                
-            }
         }
         
         public static int diaR

GameClient/Assets/Game/HotUpdate/ServerProxy/CommonSProxy.cs

@@ -38,7 +38,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    
+                    PromptController.Instance.ShowFloatTextPrompt("每日次数已重置", MessageType.SUCCESS);
                 }
             }
         }

GameClient/Assets/Game/HotUpdate/ServerProxy/RechargeSProxy.cs

@@ -0,0 +1,23 @@
+using ET;
+
+namespace GFGGame
+{
+    public class RechargeSProxy
+    {
+        public static async ETTask ReqRecharge(int rechargeId)
+        {
+            M2C_Recharge response = null;
+            response = (M2C_Recharge)await MessageHelper.SendToServer(new C2M_Recharge()
+            {
+                RechargeId = rechargeId
+            });
+            if (response != null)
+            {
+                if (response.Error == ErrorCode.ERR_Success)
+                {
+                    PromptController.Instance.ShowFloatTextPrompt("虚拟充值成功", MessageType.SUCCESS);
+                }
+            }
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/ServerProxy/RechargeSProxy.cs.meta

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

GameClient/Assets/Game/HotUpdate/Utils/ItemUtil.cs

@@ -98,16 +98,6 @@ namespace GFGGame
             ViewManager.Show(ViewName.RECHARGE_STORE_VIEW);
         }
 
-        public static void AddDiamondPurple(int value, int costNum)
-        {
-            if (!AntiAddictionController.CheckAntiAddictionRecharge(costNum))
-            {
-                RoleDataManager.diaP += value;
-                GameProxy.ReqUpdateRecharge(costNum);
-                PromptController.Instance.ShowFloatTextPrompt("虚拟充值成功", MessageType.SUCCESS);
-            }
-        }
-
         //红钻（鲛绡）
         public static void AddDiamondRed(int value = 0, Action onSuccess = null)
         {

GameClient/Assets/Game/HotUpdate/Views/RechargeStore/RechargeStoreView.cs

@@ -54,16 +54,16 @@ namespace GFGGame
         private void InitList()
         {
             _ui.m_list.RemoveChildren();
-            DiamondPurpleStoreCfg[] dataArray = DiamondPurpleStoreCfgArray.Instance.dataArray;
+            RechargeCfg[] dataArray = RechargeCfgArray.Instance.dataArray;
             int len = dataArray.Length;
             for (int i = 0; i < len; i++)
             {
-                DiamondPurpleStoreCfg itemData = dataArray[i];
+                RechargeCfg itemData = dataArray[i];
                 UI_StoreListItem itemUI = UI_StoreListItem.Proxy();
-                itemUI.m_btnBuy.text = "¥" + itemData.costNum;
+                itemUI.m_btnBuy.text = "¥" + itemData.price;
                 itemUI.m_btnBuy.onClick.Add(() =>
                 {
-                    ItemUtil.AddDiamondPurple(itemData.itemNum, itemData.costNum);
+                    RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
                 });
                 itemUI.m_txtName.text = itemData.name + "x" + itemData.itemNum;
                 itemUI.m_imgDouble.visible = false;