Merge branch 'master' of http://192.168.2.5:3000/GFG/Client

GameClient/Assets/Editor/Bat/commitGame.bat

@@ -13,4 +13,3 @@ git add .
 git commit -am "¹«ÓûúÌá½»"
 git pull
 git push
-pause

GameClient/Assets/Editor/ToolsMenu.cs

@@ -29,91 +29,10 @@ namespace GFGEditor
         }
 
 #if PT_DEV
-      [MenuItem("内网/")]
+        [MenuItem("外网DEV/")]
         public static void VersionTag()
         {
-
-        }
-        [MenuItem("策划/更新并导入所有", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportAll)]
-        static void UpdateAndImportAll()
-        {
-            UpdateProject();
-            UpdateAndImportArtRes();
-            UpdateAndImportExcel();
-            if (CommitWhenRelease)
-            {
-                CommitProject();
-            }
-        }
-
-        [MenuItem("策划/更新并导入Excel", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportExcel)]
-        static void UpdateAndImportExcelAndCommit()
-        {
-            UpdateAndImportExcel();
-            if (CommitWhenRelease)
-            {
-                CommitProject();
-            }
-        }
-
-        [MenuItem("策划/更新并导入美术资源", false, (int)TOOL_MENU_PRIORITY.UpdateAndImportArtRes)]
-        static void UpdateAndImportArtResAndCommit()
-        {
-            UpdateProjectRes();
-            UpdateAndImportArtRes();
-            if (CommitWhenRelease)
-            {
-                CommitProject();
-            }
-        }
-
-        //[MenuItem("策划/更新至内网版本", false, (int)TOOL_MENU_PRIORITY.BuildBundlesRes)]
-        //public static void ReleaseLocalVersion()
-        //{
-        //    EditorUtility.DisplayProgressBar("进度", "正在更新至内网", 1);
-        //    BuildDllHelper.BuildHotUpdateDll();
-        //    //BuildScript.BuildCustomBundles(resArr, "BuildSetting");
-        //    EditorUtility.ClearProgressBar();
-        //}
-
-        [MenuItem("策划/其它/更新项目(会丢弃未推送内容)", false, (int)TOOL_MENU_PRIORITY.UpdateProject)]
-        static void UpdateProject()
-        {
-            //关闭sqlite连接并延迟，否则sqlite文件会被占用导致不能通过命令行还原
-            SQLiteHelper.Instance.CloseConnection();
-            Thread.Sleep(1000);
-            EditorUtility.DisplayProgressBar("进度", "正在更新项目", 1);
-            ProcessUtil.ExcuteBat("Assets/Editor/Bat/", "updateGame.bat");
-            AssetDatabase.Refresh();
-            UpdateProjectRes();
-            EditorUtility.ClearProgressBar();
-        }
-
-        [MenuItem("策划/其它/导入配置表", false, (int)TOOL_MENU_PRIORITY.ImportExcel)]
-        public static void ImportExcelNeiWang()
-        {
-            ImportExcel();
-        }
-
-        [MenuItem("策划/检查配置表", false, (int)TOOL_MENU_PRIORITY.CheckExcel)]
-        public static void CheckExcel()
-        {
-            EditorUtility.DisplayProgressBar("进度", "正在检查表格", 1);
-            //检查表格部分内容
-            ExcelChecker.StartCheck();
-            EditorUtility.ClearProgressBar();
-        }
-
-        [MenuItem("策划/其它/导入美术资源", false, (int)TOOL_MENU_PRIORITY.ImportArtRes)]
-        public static void ImportArtResNeiWang()
-        {
-            ImportArtRes();
-        }
-
-        [MenuItem("策划/其它/清除冗余文件")]
-        public static void DeleteUnnecessaryImageNeiWang()
-        {
-            DeleteUnnecessaryImage();
+            
         }
 #elif PT_QUICK
         [MenuItem("QUICK/")]

GameClient/Assets/Game/HotUpdate/GameConfig.cs

@@ -32,7 +32,7 @@ namespace GFGGame
             var result = JsonMapper.ToObject<Result>(json);
             LoginAddress = result.loginApiUrl;
             // LoginAddress = "http://login.gfg.com:10005";
-            LoginAddress = "192.168.2.12:10005";//测试地址
+            //LoginAddress = "192.168.2.12:10005";//测试地址
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))
             {

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

@@ -326,7 +326,7 @@ namespace GFGGame
             {
                 if (response.Error == ErrorCode.ERR_Success)
                 {
-                    ActivityDataManager.Instance.IsGetNewPlayerReward = false;
+                    ActivityDataManager.Instance.IsGetNewPlayerReward = response.Status;
                     BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));
                     return true;
                 }

GameClient/Assets/Game/HotUpdate/Views/ActivityMainTips/NewPlayerTipsView.cs

@@ -68,7 +68,7 @@ namespace GFGGame
         private void OnClickChange()
         {
             GameGlobal.NewPlayerOnceTips = false;
-            _ui.m_t0.Play(() => { this.Hide(); });
+            this.Hide();
         }
 
     }

GameClient/Assets/Game/HotUpdate/Views/Bag/BagView.cs

@@ -32,6 +32,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+
             base.Dispose();
         }
 
@@ -107,10 +108,10 @@ namespace GFGGame
             item.m_txtName.text = itemCfg.name;
             //是礼包就加入红点
             if (((itemCfg.itemType == ConstItemType.USEABLE &&
-                 itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_SELECTABLE) ||
-                (itemCfg.itemType == ConstItemType.USEABLE &&
-                 itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM))
-                 && itemData.id != 6003001 && itemData.id != 6003002)
+                  itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_SELECTABLE) ||
+                 (itemCfg.itemType == ConstItemType.USEABLE &&
+                  itemCfg.subType == ConstItemSubType.USEABLE_GIFT_BAG_RANDOM))
+                && itemData.id != 6003001 && itemData.id != 6003002)
             {
                 RedDotController.Instance.SetComRedDot(item.target, true);
             }
@@ -118,6 +119,7 @@ namespace GFGGame
             {
                 RedDotController.Instance.SetComRedDot(item.target, false);
             }
+
             UI_ComItem.ProxyEnd();
         }
 
@@ -141,9 +143,18 @@ namespace GFGGame
             }
             else
             {
-                object[] sourceDatas = new object[]
-                    { itemCfg.id, new object[] { typeof(BagView).FullName, this.viewData } };
-                GoodsItemTipsController.ShowItemTips(itemCfg.id, sourceDatas);
+                var bagExchangeCfg = BagExchangeCfgArray.Instance.GetCfg(itemCfg.id);
+                if (bagExchangeCfg != null)
+                {
+					//从背包使用物品
+                    ViewManager.Show<BagExchangeView>(itemCfg.id);
+                }
+                else
+                {
+                    object[] sourceDatas = new object[]
+                        { itemCfg.id, new object[] { typeof(BagView).FullName, this.viewData } };
+                    GoodsItemTipsController.ShowItemTips(itemCfg.id, sourceDatas);
+                }
             }
         }
 

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

@@ -31,6 +31,7 @@ namespace GFGGame
 
             BtnSkipVertical = _ui.transform.Find("BtnSkipVertical").GetComponent<Button>();
             BtnSkipVertical.onClick.AddListener(OnClickrectBtnSkip);
+            BtnSkipVertical.gameObject.SetActive(false);
 
             videoPlayer = _ui.transform.Find("VideoPlayer").GetComponent<VideoPlayer>();
             videoPlayer.loopPointReached += OnVideoEnded;

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

@@ -704,6 +704,7 @@ namespace GFGGame
 
         private void UpdateLimitedActvityState()
         {
+            _ui.m_btnNewPlayerReward.target.visible = false;
             int actLimitTsyId = ActivityDataManager.Instance.GetCurOpenActiveByType(ConstLimitTimeActivityType.ActLimitTsy);
             if (actLimitTsyId > 0)
             {
@@ -743,12 +744,12 @@ namespace GFGGame
             _ui.m_btnWanShiLi.target.visible = ActivityWanShiLiDataManager.Instance.CheckOpen();
             _ui.m_btnTea.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(12) == 0 ? false : true;
             _ui.m_btnActivityZCJB.target.visible = ActivityDataManager.Instance.GetCurOpenActiveByType(17) == 0 ? false: true;
-            _ui.m_btnNewPlayerReward.target.visible = (ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.NewPlayerOnceTips&& GameGlobal.AutoNewPlayersTips);
+            _ui.m_btnNewPlayerReward.target.visible = (!ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.AutoNewPlayersTips);
 
             _ui.m_btnSevenReward.target.visible = !ActivityDataManager.Instance.AllSevenDayBonusGot();
             UpdateSevenIcon();
 
-            if (ActivityDataManager.Instance.IsGetNewPlayerReward)
+            if (!ActivityDataManager.Instance.IsGetNewPlayerReward)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_btnNewPlayerReward.target, true, "", -8);
             }
@@ -760,7 +761,15 @@ namespace GFGGame
             {
                 //显示今日可领取
                 int id = DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(true)].rewardsArr[0][0];
-                _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(id).res,"png");
+                if (DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(true)]
+                        .type == 2)
+                {
+                    _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath("tz_kongquednf","png");
+                }
+                else
+                {
+                    _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(id).res,"png");
+                }
                 _ui.m_btnSevenReward.m_textIcon.url = "ui://Main/zjm_hdjrkl";
                 RedDotController.Instance.SetComRedDot(_ui.m_btnSevenReward.target, true, "", -8);
             }
@@ -768,7 +777,15 @@ namespace GFGGame
             {
                 //显示明日可领取
                 int id = DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(false)+1].rewardsArr[0][0];
-                _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(id).res,"png");
+                if (DailyLoginCfgArray.Instance.dataArray[ActivityDataManager.Instance.NowSevenDayBonusDay(false)]
+                        .type == 2)
+                {
+                    _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath("tz_kongquednf","png");
+                }
+                else
+                {
+                    _ui.m_btnSevenReward.m_Icon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(id).res,"png");
+                }
                 _ui.m_btnSevenReward.m_textIcon.url = "ui://Main/zjm_hdmrkl";
                 RedDotController.Instance.SetComRedDot(_ui.m_btnSevenReward.target, false, "", -8);
             }
@@ -939,7 +956,7 @@ namespace GFGGame
         {
             _ui.m_btnGiftBag1.target.visible = false;
             _ui.m_btnGiftBag2.target.visible = false;
-
+            _ui.m_btnNewPlayerReward.target.visible = false;
             _ui.m_btnHaiZhiShi.m_loaLockIcons.visible = false;
 
             _ui.m_btnXiuFang.m_loaLockIcons.visible = !FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(XiuFangView).Name, false);
@@ -958,8 +975,8 @@ namespace GFGGame
             //!(!FunctionOpenDataManager.Instance.CheckIsFunOpenById(typeof(SevenDayLoginView).Name, false) ||
             //ActivityDataManager.Instance.AllSevenDayBonusGot()));
             _ui.m_btnDailyWelfare.target.visible = false;
-            _ui.m_btnNewPlayerReward.target.visible = (ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.NewPlayerOnceTips&& GameGlobal.AutoNewPlayersTips);
-            if(ActivityDataManager.Instance.IsGetNewPlayerReward)
+            _ui.m_btnNewPlayerReward.target.visible = (!ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.AutoNewPlayersTips);
+            if(!ActivityDataManager.Instance.IsGetNewPlayerReward)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_btnNewPlayerReward.target, true, "", -8);
             }
@@ -1121,7 +1138,7 @@ namespace GFGGame
             if (redPointUpdateFrame == 24)
                 {
                     RedDotController.Instance.SetComRedDot(_ui.m_btnMain.target
-                        , MainStoryDataManager.GetChapterRewardStatus(), "");
+                        , MainStoryDataManager.GetChapterRewardStatus(), "",-30,20);
                 }
 
             redPointUpdateFrame++;

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -48,7 +48,7 @@ namespace GFGGame
 #if PT_DEV
             //外网dev版本
             netType = EnumNetType.LOCAL;
-            cfgName = "cfg_local";
+            cfgName = "cfg_dev";
 #elif PT_TAPTAP
             netType = EnumNetType.PUBLIC;
             cfgName = "cfg_taptap";

GameClient/Assets/ResIn/UUI/UILuckyBox.prefab

@@ -84,7 +84,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
+  m_PresetInfoIsWorld: 0
 --- !u!114 &7362622180705135904
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -200,10 +200,10 @@ RectTransform:
   m_Father: {fileID: 8091540498621025810}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 1440, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &720217753082088938
 CanvasRenderer: