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

GameClient/Assets/Game/HotUpdate/Controller/LogServerHelper.cs

@@ -20,16 +20,16 @@ namespace GFGGame
             logData.Account = SystemInfo.deviceUniqueIdentifier;
             logData.EventType = node;
             var logStr = zoneScene.GetComponent<LogSplicingComponent>().LogObjectToStr(logData);
-            HttpTool.Instance.Post(LauncherConfig.logApiUrl, logStr);
+            HttpTool.Instance.Post(GameConfig.logApiReportUrl, logStr);
         }
         /// <summary>
         /// 发送玩法参与度
         /// </summary>
         /// <param name="node"></param>
-        public static void SendNodeLog(int eventType, int type)
+        public static void SendPlayParticipationLog(int eventType, int type)
         {
             var zoneScene = GameGlobal.zoneScene;
-            var logData = PlayParticipation.Instance;
+            var logData = ET.PlayParticipation.Instance;
             logData.EventId = GenerateIDUtil.GenerateId();
             logData.DtEventTime = DateTimeUtil.GetNowTime(DateTimeUtil.FormatE);
             logData.PlatFormId = LauncherConfig.platformId;
@@ -39,7 +39,7 @@ namespace GFGGame
             logData.EventType = eventType;
             logData.Type = type;
             var logStr = zoneScene.GetComponent<LogSplicingComponent>().LogObjectToStr(logData);
-            HttpTool.Instance.Post(LauncherConfig.logApiUrl, logStr);
+            HttpTool.Instance.Post(GameConfig.logApiReportUrl, logStr);
         }
     }
 }

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

@@ -10,7 +10,7 @@ namespace GFGGame
         {
             BuyItemConteoller.Show(itemId, itemCount, ConstBuyType.TYPE_SHOP, shopType, () =>
             {
-                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.FU_ZHUANG_DIAN, 2);
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_DIAN, 2);
                 GetSuitItemController.TryShow(0);
 
             }, true, false, GameConst.MAX_COUNT_TO_BUY_ITEMS);

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -10,6 +10,7 @@ namespace GFGGame
 
         public static string LoginAddress;
         public static string PlatformName;
+        public static string logApiReportUrl;
         public static int showGM;
 
         public static void InitData(string json)
@@ -20,6 +21,7 @@ namespace GFGGame
             //LoginAddress = "10.108.64.127:10005";
             PlatformName = result.platformName;
             showGM = int.Parse(result.showGM);
+            GameConfig.logApiReportUrl = LauncherConfig.logApiRootUrl + "Report";
         }
 
         private struct Result

GameClient/Assets/Game/HotUpdate/Views/Card/CardFosterView.cs

@@ -466,7 +466,7 @@ namespace GFGGame
                     this.UpdateCommon();
                     this.UpdateUpLvView();
                     this.ClearItemsCountList();
-                    LogServerHelper.SendNodeLog((int)PlayParticipationEnum.CI_PAI, 2);
+                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
 
                 }
             }
@@ -621,7 +621,7 @@ namespace GFGGame
 
                 // this._selectTab = _comFosterBottom.m_ctrlTab.selectedIndex;
                 ViewManager.Show(ViewName.CARD_UP_VIEW, new object[] { _cardData.scores, "star", _cardData.star - 1, _cardData.star }, new object[] { ViewName.CARD_FOSTER_VIEW, _cardData });
-                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.CI_PAI, 2);
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
 
             }
         }

GameClient/Assets/Game/HotUpdate/Views/Card/CardSkillView.cs

@@ -158,7 +158,7 @@ namespace GFGGame
             bool result = await CardSProxy.UpgradeCardSkill(_cardId, _skillId);
             if (result)
             {
-                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.CI_PAI, 2);
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 2);
             }
 
         }

GameClient/Assets/Game/HotUpdate/Views/ClothingDecompose/ClothingDecomposeView.cs

@@ -283,7 +283,7 @@ namespace GFGGame
             if (result)
             {
                 OnClickBtnRarity(_curRarity);
-                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.FU_ZHUANG_FEN_JIE, 2);
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_FEN_JIE, 2);
 
             }
         }

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingFosterView.cs

@@ -124,7 +124,7 @@ namespace GFGGame
             int result = await SuitFosterProxy.SendMaintainSuit(_suitId, _index + 1);
             if (result == ErrorCode.ERR_Success)
             {
-                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.FU_ZHUANG_YANG_CHENG, 2);
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_YANG_CHENG, 2);
                 this.Hide();
             }
         }

GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -412,7 +412,7 @@ namespace GFGGame
             int result = await SuitFosterProxy.SendMakeNewSuit(_suitId);
             if (result == ErrorCode.ERR_Success)
             {
-                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.FU_ZHUANG_YANG_CHENG, 2);
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_YANG_CHENG, 2);
             }
         }
         private void OnListenerRenew()

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -203,7 +203,7 @@ namespace GFGGame
             {
                 _selectedItemId = 0;
                 UpdateClothingList(true);
-                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.FU_ZHUANG_HE_CHENG, 2);
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_HE_CHENG, 2);
 
             }
 

GameClient/Assets/Game/HotUpdate/Views/DailyLogin/DailyLoginView.cs

@@ -99,7 +99,7 @@ namespace GFGGame
                 bool result = await ActivitySProxy.ReqGetDailyLoginRewards(cfg.id);
                 if (result)
                 {
-                    LogServerHelper.SendNodeLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 2);
+                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 2);
                     UpdateView();
                 }
             }

GameClient/Assets/Game/HotUpdate/Views/DailyTask/DailyTaskView.cs

@@ -130,7 +130,7 @@ namespace GFGGame
             {
                 UpdateList();
                 UpdateReward();
-                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
 
             }
         }
@@ -186,7 +186,7 @@ namespace GFGGame
             {
                 UpdateList();
                 UpdateReward();
-                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 2);
 
             }
 

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpFightView.cs

@@ -974,21 +974,21 @@ namespace GFGGame
             switch (levelCfg.type)
             {
                 case ConstInstanceZonesType.Story:
-                    LogServerHelper.SendNodeLog((int)PlayParticipationEnum.CHUN_ZHONG_LOU, 2);
+                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CHUN_ZHONG_LOU, 2);
                     break;
                 case ConstInstanceZonesType.Studio:
                     StudioCfg studioCfg = StudioCfgArray.Instance.GetCfg(levelCfg.chapterId);
                     if (studioCfg.funId == typeof(StudioMetalView).Name)
                     {
-                        LogServerHelper.SendNodeLog((int)PlayParticipationEnum.JIN_SHU_XIU_FU, 2);
+                        LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.JIN_SHU_XIU_FU, 2);
                     }
                     else if (studioCfg.funId == typeof(StudioFabricView).Name)
                     {
-                        LogServerHelper.SendNodeLog((int)PlayParticipationEnum.ZHI_WU_XIU_FU, 2);
+                        LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZHI_WU_XIU_FU, 2);
                     }
                     else if (studioCfg.funId == typeof(StudioPropertyView).Name)
                     {
-                        LogServerHelper.SendNodeLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 2);
+                        LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 2);
                     }
                     break;
 

GameClient/Assets/Game/HotUpdate/Views/DressUp/DressUpView.cs

@@ -846,7 +846,7 @@ namespace GFGGame
         }
         private void OnClickBtnPhoto()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.PAI_ZHAO, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.PAI_ZHAO, 1);
 
             if (!ViewManager.Show<PhotographView>())
             {

GameClient/Assets/Game/HotUpdate/Views/DressUp/PhotographView.cs

@@ -562,7 +562,7 @@ namespace GFGGame
             if (_ui.m_c1.selectedIndex == 0)
             {
                 ViewManager.Show<PhotographSaveView>(tex);
-                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.PAI_ZHAO, 2);
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.PAI_ZHAO, 2);
             }
             else if (_ui.m_c1.selectedIndex == 1)
             {

GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -165,7 +165,7 @@ namespace GFGGame
         }
         private void StartFight()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 2);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 2);
             int curLevelId = StoryLevelCfgArray.Instance.GetCfgsBytypeAndsubTypeAndchapterId(_curCfg.type, 0, _curCfg.id)[0].id;
             ViewManager.Show(ViewName.DRESS_UP_FIGHT_VIEW, curLevelId, new object[] { typeof(FieldView).FullName, this.viewData }, true);
             InstanceZonesDataManager.currentLevelCfgId = curLevelId;

GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -310,7 +310,7 @@ namespace GFGGame
                  if (result)
                  {
                      ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, null, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
-                     LogServerHelper.SendNodeLog((int)PlayParticipationEnum.ZAI_XING, 2);
+                     LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
                  }
              });
         }
@@ -333,7 +333,7 @@ namespace GFGGame
                 {
 
                     ViewManager.Show(ViewName.LUCKY_BOX_STAR_VIEW, null, new object[] { ViewName.LUCKY_BOX_VIEW, boxId });
-                    LogServerHelper.SendNodeLog((int)PlayParticipationEnum.ZAI_XING, 2);
+                    LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 2);
 
                 }
             });

GameClient/Assets/Game/HotUpdate/Views/MainUI/MainUIView.cs

@@ -342,7 +342,7 @@ namespace GFGGame
         }
         private void OnClickBtnMain()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.CHUN_ZHONG_LOU, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CHUN_ZHONG_LOU, 1);
             if (isOpen) return;
             isOpen = true;
             _ui.m_btnMain.m_holder1.visible = true;
@@ -376,7 +376,7 @@ namespace GFGGame
 
         private void OnClickBtnZhaiXing()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.ZAI_XING, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZAI_XING, 1);
 
             if (isOpen) return;
             isOpen = true;
@@ -418,7 +418,7 @@ namespace GFGGame
             // list.Add("StudioView");
             // list.Add("XiuFangView");
             // ViewManager.Show<FunctionOpenView>(list);
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_DNEG_LU, 1);
 
             ViewManager.Show<DailyLoginView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
             //     isOpen = false;
@@ -427,7 +427,7 @@ namespace GFGGame
         }
         private void OnClickBtnCiPai()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.CI_PAI, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.CI_PAI, 1);
 
             if (isOpen) return;
             isOpen = true;
@@ -449,7 +449,7 @@ namespace GFGGame
         }
         private void OnClickBtnField()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TIAN_YE_DIAO_CHA, 1);
 
             ViewManager.Show<FieldView>(null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
@@ -472,14 +472,14 @@ namespace GFGGame
 
         private void OnClickBtnStore()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 1);
 
             ViewManager.Show(ViewName.RECHARGE_STORE_VIEW);
         }
 
         private void OnClickBtnTuJian()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.TU_JIAN, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.TU_JIAN, 1);
 
             ViewManager.Show(ViewName.FIELD_GUIDE_VIEW, null, new object[] { ViewName.MAINUI_VIEW, this.viewData });
         }
@@ -499,7 +499,7 @@ namespace GFGGame
         }
         private void OnClickBtnRenWu()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.MEI_RI_REN_WU, 1);
 
             ViewManager.Show<DailyTaskView>();
         }

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

@@ -119,7 +119,7 @@ namespace GFGGame
             bool result = await RechargeSProxy.ReqBuyGiftBag(_giftId);
             if (result)
             {
-                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
                 this.Hide();
                 if (cfg.costType == CostType.RMB)
                 {

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

@@ -141,7 +141,7 @@ namespace GFGGame
             bool result = await RechargeSProxy.ReqExchangeShopItem(_exchangeId, _buyCount);
             if (result)
             {
-                LogServerHelper.SendNodeLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+                LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
                 this.Hide();
             }
         }

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

@@ -145,7 +145,7 @@ namespace GFGGame
                     if (!AntiAddictionController.CheckAntiAddictionRecharge(itemData.price))
                     {
                         RechargeSProxy.ReqRecharge(itemData.id).Coroutine();
-                        LogServerHelper.SendNodeLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
+                        LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHANG_CHENG, 2);
                     }
                 });
             }

GameClient/Assets/Game/HotUpdate/Views/Studio/StudioView.cs

@@ -77,7 +77,7 @@ namespace GFGGame
 
         private void OnClickComMetal()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.JIN_SHU_XIU_FU, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.JIN_SHU_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioMetalView).FullName, true)) return;
             ViewManager.Show<StudioMetalView>(new object[] { 0, 0 }, new object[] { typeof(StudioView).FullName, this.viewData });
@@ -85,7 +85,7 @@ namespace GFGGame
         }
         private void OnCliclComFabric()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.ZHI_WU_XIU_FU, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.ZHI_WU_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioFabricView).FullName, true)) return;
             ViewManager.Show<StudioFabricView>(new object[] { 0, 0 }, new object[] { typeof(StudioView).FullName, this.viewData });
@@ -94,7 +94,7 @@ namespace GFGGame
         }
         private void OnComProperty()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.SHU_HUA_XIU_FU, 1);
 
             if (!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(StudioPropertyView).FullName, true)) return;
             ViewManager.Show<StudioPropertyView>(new object[] { 1, 0 }, new object[] { typeof(StudioView).FullName, this.viewData });

GameClient/Assets/Game/HotUpdate/Views/XiuFang/XiuFangView.cs

@@ -71,20 +71,20 @@ namespace GFGGame
 
         private void OnClickBtnClothingShop()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.FU_ZHUANG_DIAN, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_DIAN, 1);
             ViewManager.Show(ViewName.CLOTHING_SHOP_VIEW, null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData }, true, true);
         }
 
         private void OnClickBtnSuitSynthetic()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.FU_ZHUANG_HE_CHENG, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_HE_CHENG, 1);
 
             ViewManager.Show(ViewName.SUIT_SYNTHETIC_LIST_VIEW, null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData });
         }
 
         private void OnClickBtnClothingUpgrade()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.FU_ZHUANG_YANG_CHENG, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_YANG_CHENG, 1);
 
             ViewManager.Show<ClothingListView>(null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData }, false, true);
 
@@ -92,7 +92,7 @@ namespace GFGGame
         }
         private void OnClickBtnDecompose()
         {
-            LogServerHelper.SendNodeLog((int)PlayParticipationEnum.FU_ZHUANG_FEN_JIE, 1);
+            LogServerHelper.SendPlayParticipationLog((int)PlayParticipationEnum.FU_ZHUANG_FEN_JIE, 1);
 
             ViewManager.Show<ClothingDecomposeView>(null, new object[] { ViewName.XIU_FANG_VIEW, this.viewData });
 

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -24,7 +24,8 @@ namespace GFGGame
         //ƽ̨id
         public static int platformId = 1;
         public static string logKey;
-        public static string logApiUrl;
+        public static string logApiRootUrl;
+        public static string logApiReportNodeUrl;
         public static string apkVersion;
         public static int serverStatus;
         public static int onDebug;
@@ -67,7 +68,8 @@ namespace GFGGame
             var result = JsonMapper.ToObject<Result>(json);
             LauncherConfig.CDN_ROOT = result.cdnRoot;
             //CDN_ROOT = "http://10.108.64.127/";
-            LauncherConfig.logApiUrl = result.logApiUrl;
+            LauncherConfig.logApiRootUrl = result.logApiUrl;
+            LauncherConfig.logApiReportNodeUrl = LauncherConfig.logApiRootUrl + "ReportNode";
             LauncherConfig.logKey = result.logKey;
             LauncherConfig.apkVersion = result.apkVersion;
             LauncherConfig.serverStatus = int.Parse(result.serverStatus);