增加游戏存活上报

fc/index.html

@@ -7,12 +7,13 @@
         <title></title>
         <link href="css/gbajs.css" rel="stylesheet" type="text/css"/>
         <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.3.2.js"></script>
-        <!-- <script src="https://cdn.jsdelivr.net/npm/tiny-browser-require@1.0.0/require.js"></script> -->
+        <script src="https://cdn.jsdelivr.net/npm/tiny-browser-require@1.0.0/require.js"></script>
-        <script type="text/javascript" src="js/require.js"></script>
+        <!--<script type="text/javascript" src="js/require.js"></script>-->
         <script type="text/javascript" src="js/jcfw/httpcli.js"></script>
         <script type="text/javascript" src="js/jcfw/httpclient.js"></script>
         <script type="text/javascript" src="js/jcfw/urlbuilder.js"></script>
         <script type="text/javascript" src="js/jcfw/jcgamelog.js"></script>
+        <script type="text/javascript" src="js/logger.js"></script>
         <script type="text/javascript" src="js/long.js"></script>
         <script type="text/javascript" src="js/bytebuffer.js"></script>
         <script type="text/javascript" src="js/protobuf.js"></script>

fc/js/jcfw/jcgamelog.js

@@ -624,6 +624,21 @@ const jcgamelog = {
       this._report(JC_LOG_T.restartgame, data);
     },
 
+    // 上报游戏还活着
+    logGameAlive(param){
+      //this._tempuuid = this.generateUUID();
+      this._starttime = new Date().getTime();
+      let data = {
+        str1: this.fromid,
+        str2: this._tempuuid,
+        str3: param? param: '',
+        str4: this.nickname,
+        str5: this.localid,
+        num1: 3
+      }
+      this._report(JC_LOG_T.restartgame, data);
+    },
+
     // 游戏结束---------本局游戏结束时上报【使用jcfw.gameOver的话此函数无需手动调用】
     logGameover(param, score, endflag){
       let nowtime = new Date().getTime();

fc/js/jcmatchvs.js

@@ -1,5 +1,4 @@
 
-var log = require('jsgamelog')
 JCMsgHandler = function(){
 
 
@@ -559,14 +558,6 @@ JCMatchVS = function(){
             this.initMsgHandler(this.msgIDs.c2sMsg(), this.msgIDs.s2cMsg());
         }.bind(this));
         this.msgctrl.init(response);
-        var env = getParameter('version');
-        var isTest = (!env || env==='test') ? '-test' : '';
-        var url = 'https://gamelog'+isTest+'.kingsome.cn/webapp/index.php'
-        this._log = log;
-        this._log.init(channel, gameid, false, '', url);
-        var accountId = getParameter('account_id');
-        var sessionId = getParameter('session_id')
-        this._log.setAccountID(accountId, sessionId);
     }
    this.downloadFile=function(fileName, registrationHandler) {
         var ajax = new XMLHttpRequest();
@@ -869,7 +860,7 @@ JCMatchVS = function(){
             user_profile: userdesc
         };
         this.msgManager.sendMsg(this.msgIDs.c2sMsg()._CMJoinRoom, param);
-        this._log && this._log.logVS_joinRoom(roomid, userdesc, false);
+        window.log && window.log.logVS_joinRoom(roomid, userdesc, false);
         return 0;
     }
 
@@ -893,7 +884,7 @@ JCMatchVS = function(){
             user_profile: userdesc
         };
         this.msgManager.sendMsg(this.msgIDs.c2sMsg()._CMJoinRandomRoom, param);
-        this._log && this._log.logVS_joinRoom('', userdesc, true);
+        window.log && window.log.logVS_joinRoom('', userdesc, true);
         return 0;
     }
 
@@ -916,7 +907,7 @@ JCMatchVS = function(){
             custom_data: content
         };
         this.msgManager.sendMsg(this.msgIDs.c2sMsg()._CMLeaveRoom, param);
-        this._log && this._log.logVS_leaveRoom(this.userinfo.roomID, content);
+        window.log && window.log.logVS_leaveRoom(this.userinfo.roomID, content);
         return 0;
     }
 
@@ -938,7 +929,7 @@ JCMatchVS = function(){
             custom_data: content
         };
         this.msgManager.sendMsg(this.msgIDs.c2sMsg()._CMJoinOver, param);
-        this._log && this._log.logVS_gameReady(this.userinfo.roomID, content, true);
+        window.log && window.log.logVS_gameReady(this.userinfo.roomID, content, true);
         return 0;
     }
 
@@ -960,7 +951,7 @@ JCMatchVS = function(){
             custom_data: content
         };
         this.msgManager.sendMsg(this.msgIDs.c2sMsg()._CMJoinOpen, param);
-        this._log && this._log.logVS_gameReady(this.userinfo.roomID, content, false);
+        window.log && window.log.logVS_gameReady(this.userinfo.roomID, content, false);
         return 0;
     }
 
@@ -982,7 +973,7 @@ JCMatchVS = function(){
             custom_data: content
         };
         this.msgManager.sendMsg(this.msgIDs.c2sMsg()._CMGameStart, param);
-        this._log && this._log.logVS_gameStart(this.userinfo.roomID, content);
+        window.log && window.log.logVS_gameStart(this.userinfo.roomID, content);
         return 0;
     }
 
@@ -1150,7 +1141,7 @@ JCMatchVS = function(){
             err = msg.result.error_code;
             errstr = msg.result.error_msg;
             this.userinfo.room_state = state_enum.none;
-            this._log && this._log.logButtonClick('matchvs', msg.result, 'onCreateRoomRsp');
+            window.log && window.log.logButtonClick('matchvs', msg.result, 'onCreateRoomRsp');
         }
         var param = {
             status: err,
@@ -1180,7 +1171,7 @@ JCMatchVS = function(){
             err = msg.result.error_code;
             errstr = msg.result.error_msg;
             this.userinfo.room_state = state_enum.none;
-            this._log && this._log.logButtonClick('matchvs', msg.result, 'onJoinRoomRsp');
+            window.log && window.log.logButtonClick('matchvs', msg.result, 'onJoinRoomRsp');
         }
 
         var lst = [];
@@ -1221,7 +1212,7 @@ JCMatchVS = function(){
         if(msg.result != null && msg.result.error_code != 0){
             err = msg.result.error_code;
             errstr = msg.result.error_msg;
-            this._log && this._log.logButtonClick('matchvs', msg.result, 'onJoinOverRsp');
+            window.log && window.log.logButtonClick('matchvs', msg.result, 'onJoinOverRsp');
         }
         var param = {
             status: err,
@@ -1238,7 +1229,7 @@ JCMatchVS = function(){
         if(msg.result != null && msg.result.error_code != 0){
             err = msg.result.error_code;
             errstr = msg.result.error_msg;
-            this._log && this._log.logButtonClick('matchvs', msg.result, 'onJoinOpenRsp');
+            window.log && window.log.logButtonClick('matchvs', msg.result, 'onJoinOpenRsp');
         }
         var param = {
             status: err,
@@ -1255,7 +1246,7 @@ JCMatchVS = function(){
         if(msg.result != null && msg.result.error_code != 0){
             err = msg.result.error_code;
             errstr = msg.result.error_msg;
-            this._log && this._log.logButtonClick('matchvs', msg.result, 'onGameStartRsp');
+            window.log && window.log.logButtonClick('matchvs', msg.result, 'onGameStartRsp');
         }
         var param = {
             status: err,
@@ -1276,7 +1267,7 @@ JCMatchVS = function(){
             err = msg.result.error_code;
             errstr = msg.result.error_msg;
             this.userinfo.room_state = state_enum.joined;
-            this._log && this._log.logButtonClick('matchvs', msg.result, 'onLeaveRoomRsp');
+            window.log && window.log.logButtonClick('matchvs', msg.result, 'onLeaveRoomRsp');
         }
         var param = {
             status: err,
@@ -1365,7 +1356,7 @@ JCMatchVS = function(){
                 err = msg.result.error_code;
                 errstr = msg.result.error_msg;
                 this._cleanState();
-                this._log && this._log.logButtonClick('matchvs', msg.result, 'onReConnectRsp');
+                window.log && window.log.logButtonClick('matchvs', msg.result, 'onReConnectRsp');
             }else{
                 this.userinfo.roomID = msg.room_info? msg.room_info.room_id: "";
             }

fc/js/logger.js

@@ -0,0 +1,31 @@
+
+var log = require('jsgamelog')
+
+function getParameter (t) {
+  var e = window.location.search,
+    i = new RegExp(t + "=([^&?]*)", "ig");
+  return e.match(i) ? e.match(i)[0].substr(t.length + 1) : null
+}
+
+window.log = log;
+var env = getParameter('version');
+var isTest = (!env || env==='test') ? '-test' : '';
+var url = 'https://gamelog'+isTest+'.kingsome.cn/webapp/index.php'
+
+window.log.init(6001, 8004, false, '', url);
+var accountId = getParameter('account_id');
+var sessionId = getParameter('session_id')
+window.log.setAccountID(accountId, sessionId);
+
+var id = getParameter('id');
+var netmode = getParameter("roomId")?1:0;
+
+var logObj = {
+  gid: id,
+  m: netmode
+}
+window.log.logStartGame(logObj);
+
+setInterval(function () {
+  window.log.logGameAlive(logObj);
+}, 60000)

gba/index.html

@@ -6,6 +6,13 @@
 	<title></title>
 	<script src="dist/gbajs.min.js?v=6"></script>
 	<link href="dist/gbajs.min.css" rel="stylesheet" type="text/css"/>
+	<script src="https://cdn.jsdelivr.net/npm/tiny-browser-require@1.0.0/require.js"></script>
+	<!--<script type="text/javascript" src="../fc/js/require.js"></script>-->
+	<script type="text/javascript" src="../fc/js/jcfw/httpcli.js"></script>
+	<script type="text/javascript" src="../fc/js/jcfw/httpclient.js"></script>
+	<script type="text/javascript" src="../fc/js/jcfw/urlbuilder.js"></script>
+	<script type="text/javascript" src="../fc/js/jcfw/jcgamelog.js"></script>
+	<script type="text/javascript" src="../fc/js/logger.js"></script>
 </head>
 <body>
 <canvas id="screen" width="240" height="160"></canvas>

gba2/index.html

@@ -51,7 +51,7 @@
             <!--Add your webpage scripts below-->
             <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
             <script src="user_scripts/libs/zip/jszip.min.js"></script>
-          
+
 
             <script src="user_scripts/XAudioJS/swfobject.js"></script>
             <script src="user_scripts/XAudioJS/resampler.js"></script>
@@ -67,6 +67,12 @@
 
             <!-- <script src="dist/gbajs.min.js?v=5"></script> -->
             <link href="dist/gbajs.min.css" rel="stylesheet" type="text/css"/>
+            <script src="https://cdn.jsdelivr.net/npm/tiny-browser-require@1.0.0/require.js"></script>
+            <script type="text/javascript" src="../fc/js/jcfw/httpcli.js"></script>
+            <script type="text/javascript" src="../fc/js/jcfw/httpclient.js"></script>
+            <script type="text/javascript" src="../fc/js/jcfw/urlbuilder.js"></script>
+            <script type="text/javascript" src="../fc/js/jcfw/jcgamelog.js"></script>
+            <script type="text/javascript" src="../fc/js/logger.js"></script>
 </head>
 <body>
 <canvas id="screen" width="240" height="160"></canvas>

gulpfile.js

@@ -11,9 +11,8 @@ const javascriptObfuscator = require('gulp-javascript-obfuscator');
 const obfuscatorOptions = {
                 compact:true,
                 sourceMap: false,
-                debugProtection: true,
+                debugProtection: false,
-                disableConsoleOutput: true,
+                disableConsoleOutput: false
-                domainLock: ['.kingsome.cn', '.zhl.com']
             };
     //检查js的语法错误
     gulp.task('jslint', function () {