Merge remote-tracking branch 'remotes/org/dev'

GameClient/Assets/Editor/ToolsMenu.cs

@@ -29,10 +29,91 @@ namespace GFGEditor
         }
 
 #if PT_DEV
-        [MenuItem("外网DEV/")]
+      [MenuItem("内网/")]
         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/Constant/ConstMessage.cs

@@ -246,5 +246,7 @@ namespace GFGGame
         public const string TIMETRACINGUPDATE = "TIMETRACING_UPDATE";
         //时光回溯红点更新
         public const string TIMETRACINGREDUPDATE = "TIMETRACING_RED_UPDATE";
+        //章节奖励红点更新
+        public const string STORYCHAPREDUPDATE = "STORYCHAP_RED_UPDATE";
     }
 }

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 = "175.178.189.228:10003";//测试地址
+            LoginAddress = "192.168.2.12:10005";//测试地址
             showGM = int.Parse(result.showGM);
             if(!string.IsNullOrEmpty(result.openTime))
             {

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

@@ -86,7 +86,7 @@ namespace GFGGame
                     {
                         if(response.PassStatusKs[i] == id)
                         {
-                            MainStoryDataManager.ChapterRewardStatusDic[i] = response.PassStatusVs[i];
+                            MainStoryDataManager.ChapterRewardStatusDic[id] = response.PassStatusVs[i];
                         }  
                     }
                     BonusController.TryShowBonusList(ItemUtil.CreateItemDataList(response.BonusList));

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

@@ -61,6 +61,7 @@ namespace GFGGame
         private async void OnClickGetReward()
         {
             bool result;
+            GameGlobal.NewPlayerOnceTips = false;
             result = await ActivitySProxy.ReqGetNewPlayerBonus();
             this.Hide();
         }

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterListView.cs

@@ -3,6 +3,8 @@ using FairyGUI;
 using System.Collections.Generic;
 using UI.Main;
 using UnityEngine;
+using UnityEngine.PlayerLoop;
+
 namespace GFGGame
 {
     public class StoryChapterListView : BaseWindow
@@ -12,6 +14,7 @@ namespace GFGGame
         private int subType = ConstInstanceZonesSubType.Normal;
         private List<StoryChapterCfg> _chapterCfgs;
         private int chapterIndex = 1;
+        private int rewardID = 0;
         public override void Dispose()
         {
             if (_ui != null)
@@ -50,6 +53,17 @@ namespace GFGGame
 
 
         }
+        protected override void AddEventListener()
+        {
+            base.AddEventListener();
+            EventAgent.AddEventListener(ConstMessage.STORYCHAPREDUPDATE, UpdateChapterRed);
+        }
+
+        protected override void RemoveEventListener()
+        {
+            base.RemoveEventListener();
+            EventAgent.RemoveEventListener(ConstMessage.STORYCHAPREDUPDATE,UpdateChapterRed);
+        }
 
         protected override void OnShown()
         {
@@ -148,6 +162,7 @@ namespace GFGGame
         {
             GObject chapterItem = context.sender as GObject;
             int chapterID = (int)chapterItem.data;
+            rewardID = chapterID;
             int status;
             if(MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID,out status) && status == 1)
             {
@@ -155,11 +170,28 @@ namespace GFGGame
                 bool result = await MainStorySProxy.GetStoryBonusReward(chapterID);
                 if(result)
                 {
+                    EventAgent.DispatchEvent(ConstMessage.STORYCHAPREDUPDATE);
                     return;
                 }
             }
         }
 
+        private void UpdateChapterRed()
+        {
+            //UpdateList();
+            foreach (var item in ChapterRewardCfgArray.Instance.dataArray)
+            {
+                if (item.chapterId == rewardID)
+                {
+                    UI_ListChapterItem listItem = UI_ListChapterItem.Proxy(_ui.m_listChapter.GetChildAt(item.id%10));
+                    listItem.m_content.m_reward.target.visible = false;
+                    RedDotController.Instance.SetComRedDot(listItem.m_content.m_reward.target, false, "");
+                    UI_ListChapterItem.ProxyEnd();
+                }
+            }
+
+        }
+
         private void ListChapterItem(int index, GObject item)
         {
             if (index == 0 || index == _ui.m_listChapter.numItems - 1)
@@ -290,13 +322,13 @@ namespace GFGGame
                         int status;
                         if (MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID, out status))
                         {
-                            List<ChapterRewardCfg> chapterReward = ChapterRewardCfgArray.Instance.GetCfgsBychapterId(chapterID);
-                            listItem.m_content.m_reward.m_rewardIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(chapterReward[0].bonusOnceArr[0][0]).res, "png");
-                            listItem.m_content.m_reward.m_rewardNum.text = string.Format("x{0}", chapterReward[0].bonusOnceArr[0][1].ToString());
+                            ChapterRewardCfg chapterReward = ChapterRewardCfgArray.Instance.GetCfgBychapterId(chapterID);
+                            listItem.m_content.m_reward.m_rewardIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(chapterReward.bonusOnceArr[0][0]).res, "png");
+                            listItem.m_content.m_reward.m_rewardNum.text = string.Format("x{0}", chapterReward.bonusOnceArr[0][1].ToString());
                         }
                         if (MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID, out status) && status == 1)
                         {
-                            RedDotController.Instance.SetComRedDot(listItem.m_content.m_reward.target, true, "");
+                            RedDotController.Instance.SetComRedDot(listItem.m_content.m_reward.target, true, "",-50,20);
                         }
                         else if (MainStoryDataManager.ChapterRewardStatusDic.TryGetValue(chapterID, out status) && status == 2)
                         {
@@ -307,7 +339,7 @@ namespace GFGGame
                         {
                             listItem.m_content.m_reward.target.onClick.Add(OnClickReward);
                         }
-                        listItem.m_content.m_reward.target.data = chapterCfg.id;
+                        listItem.m_content.m_reward.target.data = chapterID;
                     }
                     else
                     {
@@ -336,6 +368,11 @@ namespace GFGGame
                         }
                     }
                 }
+                //暂定精英关卡不显示
+                if (subType == 1)
+                {
+                    listItem.m_content.m_reward.target.visible = false;
+                }
                 UI_ListChapterItem.ProxyEnd();
             }
             if (isView)

GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryChapterView.cs

@@ -508,11 +508,11 @@ namespace GFGGame
             // bonusBox.m_ComRewardEffect.visible = status == ConstBonusStatus.CAN_GET;
             if (status == ConstBonusStatus.GOT)
             {
-                bonusBox.m_icon.url = "ui://Main/zxian_gift_get";
+                bonusBox.m_icon.url = "ui://Main/tgjljinnang_off";
             }
             else
             {
-                bonusBox.m_icon.url = "ui://Main/zxian_gift_unget";
+                bonusBox.m_icon.url = "ui://Main/tgjljinnang_no";
             }
             bonusBox.target.data = status;
         }

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

@@ -743,7 +743,7 @@ 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;
+            _ui.m_btnNewPlayerReward.target.visible = (ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.NewPlayerOnceTips&& GameGlobal.AutoNewPlayersTips);
 
             _ui.m_btnSevenReward.target.visible = !ActivityDataManager.Instance.AllSevenDayBonusGot();
             UpdateSevenIcon();
@@ -958,7 +958,7 @@ 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;
+            _ui.m_btnNewPlayerReward.target.visible = (ActivityDataManager.Instance.IsGetNewPlayerReward&& GameGlobal.NewPlayerOnceTips&& GameGlobal.AutoNewPlayersTips);
             if(ActivityDataManager.Instance.IsGetNewPlayerReward)
             {
                 RedDotController.Instance.SetComRedDot(_ui.m_btnNewPlayerReward.target, true, "", -8);
@@ -1118,9 +1118,14 @@ namespace GFGGame
 
                 }
             }
+            if (redPointUpdateFrame == 24)
+                {
+                    RedDotController.Instance.SetComRedDot(_ui.m_btnMain.target
+                        , MainStoryDataManager.GetChapterRewardStatus(), "");
+                }
 
             redPointUpdateFrame++;
-            if(redPointUpdateFrame > 24)
+            if(redPointUpdateFrame > 25)
             {
                 redPointUpdateFrame = -1;
             }

GameClient/Assets/Game/HotUpdate/Views/RoleInfo/GMPanelView.cs

@@ -165,6 +165,8 @@ namespace GFGGame
             string messageSuc = string.Format("当前关卡第{0}章第{1}关", _ui.m_ComBtn.m_txtChapter.text,
                 _ui.m_ComBtn.m_txtChapterLv.text);
             GMController.SendGMCommand("chapter " + content, messageSuc).Coroutine();
+            ActivitySProxy.ReqGetNewPlayerBonusStatus().Coroutine();
+            MainStorySProxy.GetStoryBonusDate().Coroutine();
         }
 
         private async void OnClickBtnSkipCheckOpen()

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -47,8 +47,8 @@ namespace GFGGame
             launcherRootUrl = "http://gfgclient.obs.cn-north-4.myhuaweicloud.com/";
 #if PT_DEV
             //外网dev版本
-            netType = EnumNetType.PUBLIC;
-            cfgName = "cfg_dev";
+            netType = EnumNetType.LOCAL;
+            cfgName = "cfg_local";
 #elif PT_TAPTAP
             netType = EnumNetType.PUBLIC;
             cfgName = "cfg_taptap";

GameClient/Assets/ResIn/UI/Main/Main_atlas0_12!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 0ea93bfcf9095bd4ebb1279306f2350b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UI/Main/Main_atlas0_12.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 234758eecdc344d49aafc566443b98a5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

GameClient/Assets/ResIn/UUI/UICG.prefab

@@ -86,7 +86,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!114 &7362622180705135904
 MonoBehaviour:
   m_ObjectHideFlags: 0

GameClient/Assets/ResIn/UUI/UILuckyBox.prefab

@@ -84,7 +84,7 @@ MonoBehaviour:
   m_FallbackScreenDPI: 96
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!114 &7362622180705135904
 MonoBehaviour:
   m_ObjectHideFlags: 0