Переглянути джерело

fixed: 支付宝沙箱appid和正式appid.

王刚 3 роки тому
батько
коміт
069299b7ec

+ 18 - 9
CSserver/BattleRoom/server/Room.cs

@@ -109,10 +109,25 @@ namespace BattleRoom
             callbacks.Add(eProtocalCommand.CsBtStatus, On_BtStatus);
             callbacks.Add(eProtocalCommand.CsBtPosition, On_BtPosition);
             callbacks.Add(eProtocalCommand.CsBtBroadCast, On_BtBroadCast);
+            callbacks.Add(eProtocalCommand.CsBtPeopleList, On_PeopleList);
             var t = Task.Run(MsgLoop);
             Open();
         }
 
+
+        void On_PeopleList(int peerId, sSocketData data)
+        {
+            var msg = CS_BT_PeopleList.Parser.ParseFrom(data._data);
+            if (ClientPeers.TryGetValue(peerId, out var peer))
+            {
+                Console.WriteLine($"{msg.Uid} 在请求队友列表.");
+                var info = new SC_BT_PeopleList() { NewerUid = "", Zoneid = msg.Zoneid };
+                info.PlayerUids.AddRange(PlayerUids);
+                peer.SendEvent(eProtocalCommand.ScBtPeopleList, info);
+            }
+        }
+
+
         void On_BtStatus(int peerId, sSocketData data)
         {
             var msg = CS_BT_Status.Parser.ParseFrom(data._data);
@@ -136,7 +151,7 @@ namespace BattleRoom
             var msg = CS_BT_BroadCast.Parser.ParseFrom(data._data);
             if (ClientPeers.TryGetValue(peerId, out var peer))
             {
-                var info = new SC_BT_BroadCast() {Msg= msg.Msg, SenderUid = msg.SenderUid, Zoneid = msg.Zoneid };
+                var info = new SC_BT_BroadCast() { Msg = msg.Msg, SenderUid = msg.SenderUid, Zoneid = msg.Zoneid };
                 this.Broadcast(TargetType.Others, eProtocalCommand.CsBtStatus, info);
             }
         }
@@ -146,7 +161,7 @@ namespace BattleRoom
             var msg = CS_BT_Over.Parser.ParseFrom(data._data);
             if (ClientPeers.TryGetValue(peerId, out var peer))
             {
-                var info = new SC_BT_Over() { Msg= msg.Msg, SenderUid = msg.SenderUid, Zoneid = msg.Zoneid };
+                var info = new SC_BT_Over() { Msg = msg.Msg, SenderUid = msg.SenderUid, Zoneid = msg.Zoneid };
                 this.Broadcast(TargetType.Others, eProtocalCommand.CsBtStatus, info);
             }
         }
@@ -233,15 +248,9 @@ namespace BattleRoom
                     p.room = this;
                     this.ClientPeers.Add(p.Id, p);
                 }
-                var list = new SC_MD_EnterRoom() { Uid = p.UID, Zoneid = p.zoneid };
-
-                ClientPeers.Values.ToList().ForEach(c => list.PlayerUids.Add(c.UID));
-                Broadcast(TargetType.All, eProtocalCommand.ScMdEnterRoom, list);
-                Console.WriteLine("房间内广播进入房间事件!");
             }
             else
-            {
-
+            { 
                 WriteLine("游戏结束2 // 这里不应该执行到!!!");
                 p.SendEvent(eProtocalCommand.ScGameOver, new SC_MD_EnterRoom() { });
                 p.Close();

+ 3 - 3
Gameserver/Amfphp/service_call/pay/official/alipay/config_alipay.php

@@ -37,14 +37,14 @@ class config_alipay {
     static function Inst() {
         $c = new config_alipay();
         if (self::sandbox) {
-            $c->appId = '2016082700322931';
+            $c->appId = '2016082700322931';                                     # 沙箱appid
             $c->notify_Url = 'http://115.159.121.129/ylsj/Gameserver/Amfphp/service_call/pay/official/alipay/notify.php';
             $c->gatewayUrl = "https://openapi.alipay.com/gateway.do";
             $c->rsaPrivateKey = 'MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCcDYWl3khY9aJzI1pFRn+47AWGNI3iS3SBka6bTlDWeZOUhYiG0WwrWnIcqMdK3wL4OmtaPS9hGls+HyaRpBCczV4wlwRcD/AeR18qwXIumMOFTMGPQat2DAavhdOeFJZlktS8sVgZhcxR1OYU81h/OG/M1zWizrQpRHwIhx7ttOdzT4GG3EgUBRj3FtFI/lU7dH2pgRx61uCEjTggCqaW7X1plBm1QYxQFvI57xqy9wOm+uPAC2TmmR3bDyIqYTHQ+cu/Q728QWhDnMrGwVpoEU8gnhlFH4hyoZ2GuZX4WXRzePYPuLaKIqtJl/uR4cOTeYthcDFpau+FXI/dFLd/AgMBAAECggEBAIvMlVk13AxN6X1KQ3liIdOxJXXIKP98Z2AX+ZtKOqMZATwBsIBOpp/kA+xmyzrotIlaFIgf3g0YhnsNfwjkOLmwRVw0PgSXhp4phDkSWc8ira4CSDilNQyo02h09FJe0SkntAtiuLEMqzD4EDLemf5GuemBNpymnsGFh7RAEFYT3JM76+vW8JgMDsdEgA7RFbLiKb/yPsVBm9Zeta9oZc/hcR3CXLG1lzhH51cWWhTRnBYg5VGhHl+Dx3XNHRj2DKZQThDz3Wu186yoYdyAFewxKwYeHz4c5gJZF8YKDPpaHQG1qcDCBidbMs8gHzCxFOn5gFt6EnUQ/5E5DLpGwykCgYEA4jg0GBBf/zGxOlQ+2/x63Nz9ZnWEVqZYcqw8k8ASaJFVq9EWPqc8Yvui9aG7WZd8noVZ8+2RSMObQJT3XP0YIIELz5ZNrAYWJIreogzIF29h/4WbhXhFBUOBKhMq9AMY8lZI+ST/fj+KDIS965awtuY3L6JH8rOkyiwUunOUWMsCgYEAsJijeue92Wl6WJkJNPMjlqFB7BeHCB4+NsPm4J3pj18cGBRn9MEaPVlJxGTmVNSh89VZUzErKnmfTCDrHuqwdRac9r5LYuhI/vuJ47CPV7vx4jq95542+RLVAgDio4+U3cBwqJTpuGjeVSXE+FcbPaXFTEj34V4cmZgwXLUtaZ0CgYBePnn9eHz1zRb/rO9PKL1q3Co5kEXk74Izq+vExiUlKT8eyInS6ksvFZSLbqilp4XEaNvT0qpPPSal3im7tLljeT+ZaQ3M1/BLowsjSd3mXYHfOSNUlIl0qu3ZwIiJhezTsPzPxwkl6ISzuG2DA5F1cS2Wi64bv5msnHa6QsKPxwKBgG7S24U9+X5/GzCOmaCJFURqXpxzB2Ko2BI2TqWXdANthIv4AmUu6fCmIA0H5SRHbHtA4JW8vYIiYT29StBUJ/jTAB44vcaMT4L1CEvDebFtWRbIFnVMbONSViqzs4dBjAK9yfWBvkrkROLamQngYFAHwBFnmWftT7V0NKV5bc5hAoGBAMPtjnqC4Yi0G8Bn27dXoZS4rVvOi1CuEGRmtO2QF52tA1PEqlS7sD4MczdueYGSpdqdUFBiSF137Y+cQAdOIfYDwg+IeA7q65iSrveZ1J5AMLW+yjsww8K8fu6OcVs4MqcSuAAfP7E1+wgOoWawajZwHCROoS7MNWY3sRl+3cr0';
             $c->alipayrsaPublicKey = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3GQrGmNZcv4EqhiLOJz9jVzV8VDxNjyg29Af0kSPnT/8274Yeb/rDKowitbSZxeGhpIe+J4jiI9tpuhyB2PltxYN9EDOdkJ0fudDVS3lGotQn5noZ8ccEU//T55c5TMlV2TzhhIfw7MhMeJeJDCPcm33Q0085H6SRRLvjSwRbv0bPmJT0F1oUASk0fvHAIXaoQDNy/YjEWziEVCBSTKuI35BGT8czVUXQq++7OejUZN2O64Fxs/JIv1jD3Ww+Su1je9L3fb4FbEQsy4Q+fp27Nh2dkvNli7C5JA2cvKUTD95fgtsIQwsv19EnzAZCBaIe1PWdiKVkqayh+gPqQZh1QIDAQAB';
         } else {
-            $c->appId = '2016082700322931';
-            $c->notify_Url = 'http://www.game7000.com/PaySDK/official/notify.php';
+            $c->appId = '2017121500821785';
+            $c->notify_Url = 'http://115.159.121.129/ylsj/Gameserver/Amfphp/service_call/pay/official/alipay/notify.php';
             $c->gatewayUrl = "https://openapi.alipay.com/gateway.do";
             $c->rsaPrivateKey = 'MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCcDYWl3khY9aJzI1pFRn+47AWGNI3iS3SBka6bTlDWeZOUhYiG0WwrWnIcqMdK3wL4OmtaPS9hGls+HyaRpBCczV4wlwRcD/AeR18qwXIumMOFTMGPQat2DAavhdOeFJZlktS8sVgZhcxR1OYU81h/OG/M1zWizrQpRHwIhx7ttOdzT4GG3EgUBRj3FtFI/lU7dH2pgRx61uCEjTggCqaW7X1plBm1QYxQFvI57xqy9wOm+uPAC2TmmR3bDyIqYTHQ+cu/Q728QWhDnMrGwVpoEU8gnhlFH4hyoZ2GuZX4WXRzePYPuLaKIqtJl/uR4cOTeYthcDFpau+FXI/dFLd/AgMBAAECggEBAIvMlVk13AxN6X1KQ3liIdOxJXXIKP98Z2AX+ZtKOqMZATwBsIBOpp/kA+xmyzrotIlaFIgf3g0YhnsNfwjkOLmwRVw0PgSXhp4phDkSWc8ira4CSDilNQyo02h09FJe0SkntAtiuLEMqzD4EDLemf5GuemBNpymnsGFh7RAEFYT3JM76+vW8JgMDsdEgA7RFbLiKb/yPsVBm9Zeta9oZc/hcR3CXLG1lzhH51cWWhTRnBYg5VGhHl+Dx3XNHRj2DKZQThDz3Wu186yoYdyAFewxKwYeHz4c5gJZF8YKDPpaHQG1qcDCBidbMs8gHzCxFOn5gFt6EnUQ/5E5DLpGwykCgYEA4jg0GBBf/zGxOlQ+2/x63Nz9ZnWEVqZYcqw8k8ASaJFVq9EWPqc8Yvui9aG7WZd8noVZ8+2RSMObQJT3XP0YIIELz5ZNrAYWJIreogzIF29h/4WbhXhFBUOBKhMq9AMY8lZI+ST/fj+KDIS965awtuY3L6JH8rOkyiwUunOUWMsCgYEAsJijeue92Wl6WJkJNPMjlqFB7BeHCB4+NsPm4J3pj18cGBRn9MEaPVlJxGTmVNSh89VZUzErKnmfTCDrHuqwdRac9r5LYuhI/vuJ47CPV7vx4jq95542+RLVAgDio4+U3cBwqJTpuGjeVSXE+FcbPaXFTEj34V4cmZgwXLUtaZ0CgYBePnn9eHz1zRb/rO9PKL1q3Co5kEXk74Izq+vExiUlKT8eyInS6ksvFZSLbqilp4XEaNvT0qpPPSal3im7tLljeT+ZaQ3M1/BLowsjSd3mXYHfOSNUlIl0qu3ZwIiJhezTsPzPxwkl6ISzuG2DA5F1cS2Wi64bv5msnHa6QsKPxwKBgG7S24U9+X5/GzCOmaCJFURqXpxzB2Ko2BI2TqWXdANthIv4AmUu6fCmIA0H5SRHbHtA4JW8vYIiYT29StBUJ/jTAB44vcaMT4L1CEvDebFtWRbIFnVMbONSViqzs4dBjAK9yfWBvkrkROLamQngYFAHwBFnmWftT7V0NKV5bc5hAoGBAMPtjnqC4Yi0G8Bn27dXoZS4rVvOi1CuEGRmtO2QF52tA1PEqlS7sD4MczdueYGSpdqdUFBiSF137Y+cQAdOIfYDwg+IeA7q65iSrveZ1J5AMLW+yjsww8K8fu6OcVs4MqcSuAAfP7E1+wgOoWawajZwHCROoS7MNWY3sRl+3cr0';
             $c->alipayrsaPublicKey = 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3GQrGmNZcv4EqhiLOJz9jVzV8VDxNjyg29Af0kSPnT/8274Yeb/rDKowitbSZxeGhpIe+J4jiI9tpuhyB2PltxYN9EDOdkJ0fudDVS3lGotQn5noZ8ccEU//T55c5TMlV2TzhhIfw7MhMeJeJDCPcm33Q0085H6SRRLvjSwRbv0bPmJT0F1oUASk0fvHAIXaoQDNy/YjEWziEVCBSTKuI35BGT8czVUXQq++7OejUZN2O64Fxs/JIv1jD3Ww+Su1je9L3fb4FbEQsy4Q+fp27Nh2dkvNli7C5JA2cvKUTD95fgtsIQwsv19EnzAZCBaIe1PWdiKVkqayh+gPqQZh1QIDAQAB';