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

# Conflicts:
#	FGUIProject/assets/CommonGame/package.xml

FGUIProject/assets/ActivityDay7/ActivityDay7UI.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1080,1920" designImage="ui://kupdwln7nyhm0">
   <displayList>
-    <loader id="n24_jttb" name="loaBg" xy="540,960" pivot="0.5,0.5" anchor="true" size="1080,2400" fill="scaleMatchWidth">
-      <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
+    <loader id="n24_jttb" name="loaBg" xy="540,1200" pivot="0.5,0.5" anchor="true" size="1080,2400" url="ui://kupdwln7vnbyj" fill="scaleMatchWidth" clearOnPublish="true">
+      <relation target="" sidePair="width-width,height-height,top-top"/>
     </loader>
+    <image id="n25_vnby" name="n25" src="nyhm8" fileName="imagesNew/qrhd_db.png" pkg="eg2y0ldp" xy="0,790">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
     <component id="n0_nyhm" name="btnBack" src="9xlo8" fileName="components/BtnBack.xml" pkg="eg2y0ldp" xy="48,78"/>
-    <image id="n1_nyhm" name="n1" src="nyhm5" fileName="images/sj_db.png" xy="367,108" pkg="eg2y0ldp"/>
-    <text id="n2_nyhm" name="TimeStr" xy="461,107" size="156,44" fontSize="32" color="#fffaec" autoSize="none" text=""/>
-    <component id="n4_nyhm" name="n4" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="640,100"/>
+    <image id="n1_nyhm" name="n1" src="nyhm5" fileName="imagesNew/sj_db.png" pkg="eg2y0ldp" xy="367,108"/>
+    <text id="n2_nyhm" name="TimeStr" xy="401,107" size="231,44" fontSize="32" color="#fffaec" align="center" vAlign="middle" autoSize="none" text=""/>
+    <component id="n4_nyhm" name="tip" src="nyhmtly" fileName="components/ButtonRed.xml" pkg="eg2y0ldp" xy="640,100"/>
     <component id="n6_rle1" name="ExpProcess" src="nyhmf" fileName="components/ExpProcess.xml" xy="74,190">
       <ProgressBar value="50" max="100"/>
     </component>
@@ -26,6 +29,7 @@
       <item/>
     </list>
     <list id="n12_jttb" name="TaskList" xy="12,983" size="1064,937" overflow="scroll" defaultItem="ui://eg2y0ldplh8v5">
+      <relation target="" sidePair="bottomext-bottom"/>
       <item/>
       <item/>
       <item/>

FGUIProject/assets/ActivityDay7/package.xml

@@ -16,6 +16,7 @@
     <component id="nyhmf" name="ExpProcess.xml" path="/components/"/>
     <component id="rle1h" name="ButtonDay.xml" path="/components/"/>
     <component id="bhmmi" name="ExpProcessItem.xml" path="/components/" exported="true"/>
+    <image id="vnbyj" name="qrhd_banner_yxzy.png" path="/Designs/"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/ActivityDay7" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

FGUIProject/assets/CommonGame/package.xml

@@ -20,6 +20,7 @@
     <image id="d4iwj" name="sc_anniu_1.png" path="/imagesExport/" exported="true"/>
     <image id="pal5v" name="zx_anniutz_1.png" path="/imagesExport/" exported="true"/>
     <image id="ga165b" name="hz_ssuodikuang.png" path="/imagesExport/" exported="true"/>
+    <component id="ga165c" name="ButtonTab1.xml" path="/components/" exported="true"/>
     <image id="s2cc55" name="zd_xztup_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="21,3,8,6"/>
     <image id="fka77" name="cj_yihde.png" path="/imagesExport/" exported="true"/>
     <component id="tu965e" name="GetSuitItemUI.xml" path="/" exported="true"/>
@@ -339,16 +340,7 @@
     <image id="idkdtnb" name="hl_jfscibt.png" path="/imagesNew/"/>
     <image id="qqhzk" name="an_yellow_1.png" path="/imagesNew/" exported="true"/>
     <image id="idkdtnc" name="xsqg_zsx.png" path="/imagesNew/" exported="true"/>
-    <component id="volstne" name="BtnStyle005.xml" path="/components/" exported="true"/>
-    <image id="volstnf" name="an_bt_jin.png" path="/imagesNew/" exported="true"/>
-    <image id="volstng" name="an_bt_bai.png" path="/imagesNew/" exported="true"/>
-    <component id="volstnh" name="BtnStyle006.xml" path="/components/" exported="true"/>
-    <image id="volstni" name="an_bt_cut.png" path="/imagesNew/" exported="true"/>
-    <component id="volstnj" name="ComIcon003.xml" path="/components/" exported="true"/>
-    <image id="volstc1" name="wp_bg_yuan.png" path="/imagesNew/"/>
-    <image id="volstc2" name="wp_own.png" path="/imagesNew/"/>
-    <component id="volstnk" name="ComItem003.xml" path="/components/" exported="true"/>
-    <image id="9jv65o" name="lm_fl_db.png" path="/bgimg/" exported="true" scale="9grid" scale9grid="269,993,538,25"/>
+    <component id="volstnd" name="ComIcon003.xml" path="/components/" exported="true"/>
   </resources>
   <publish name="" path="../GameClient/Assets/ResIn/UI/CommonGame" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>

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

@@ -25,5 +25,12 @@ namespace GFGGame
         {
             return GetActivityDay7Day() <= Activity7DaysCfgArray.Instance.dataArray.Length;
         }
+        
+        public long GetEndTime()
+        {
+            return TimeUtil.TodayRestTime() +
+                   (Activity7DaysCfgArray.Instance.dataArray.Length - GetActivityDay7Day())
+                   * TimeUtil.SECOND_PER_DAY * 1000;
+        }
     }
 }

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

@@ -60,7 +60,7 @@ namespace GFGGame
                     FunctionOpenDataManager.Instance.CheckHasSpecialFunOpen();
                 }
             }
-            if ((itemCfg.itemType == ConstItemType.ITEM || itemCfg.itemType == ConstItemType.GIFT_BAG) &&
+            if ((itemCfg.itemType == ConstItemType.ITEM || itemCfg.itemType == ConstItemType.USEABLE) &&
                 itemData.num > 0)
             {
                 BagDataManager.Instance.Add(itemData);
@@ -100,7 +100,7 @@ namespace GFGGame
                     {
                         BagDataManager.Instance.Remove(itemID);
                     }
-                    if (itemCfg.itemType == ConstItemType.GIFT_BAG)
+                    if (itemCfg.itemType == ConstItemType.USEABLE)
                     {
                         BagDataManager.Instance.Remove(itemID);
                     }

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

@@ -1,11 +1,7 @@
 using System;
-using System.Collections;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 using ET;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
-using UI.DressUp;
 
 namespace GFGGame
 {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityDay7/UI_ActivityDay7UI.cs

@@ -10,6 +10,7 @@ namespace UI.ActivityDay7
         public GLoader m_loaBg;
         public GButton m_btnBack;
         public GTextField m_TimeStr;
+        public GButton m_tip;
         public GProgressBar m_ExpProcess;
         public GTextField m_Score;
         public GList m_DayList;
@@ -66,6 +67,7 @@ namespace UI.ActivityDay7
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_btnBack = (GButton)comp.GetChild("btnBack");
             m_TimeStr = (GTextField)comp.GetChild("TimeStr");
+            m_tip = (GButton)comp.GetChild("tip");
             m_ExpProcess = (GProgressBar)comp.GetChild("ExpProcess");
             m_Score = (GTextField)comp.GetChild("Score");
             m_DayList = (GList)comp.GetChild("DayList");
@@ -78,6 +80,7 @@ namespace UI.ActivityDay7
             m_loaBg = null;
             m_btnBack = null;
             m_TimeStr = null;
+            m_tip = null;
             m_ExpProcess = null;
             m_Score = null;
             m_DayList = null;

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

@@ -39,9 +39,8 @@ namespace GFGGame
                     }
 
                     List<ItemData> itemDatas;
-                    if (itemCfg.itemType == ConstItemType.GIFT_BAG &&
-                        (itemCfg.subType == ConstItemSubType.GIFT_BAG_AUTO ||
-                         itemCfg.subType == ConstItemSubType.CONTINUOUS_REWARD_GIFT))
+                    if (itemCfg.itemType == ConstItemType.USEABLE &&
+                        (itemCfg.subType == ConstItemSubType.USEABLE_AUTO))
                     {
                         itemDatas = ItemUtil.CreateItemDataList(itemCfg.itemsArr, response.Times * shopCfg.itemNum);
                     }

GameClient/Assets/Game/HotUpdate/Views/ActivityDay7/ActivityDay7View.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using ET;
 using FairyGUI;
 using UI.ActivityDay7;
 using UI.CommonGame;
@@ -38,9 +39,11 @@ namespace GFGGame
             isfullScreen = true;
             bringToFontOnClick = false;
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
-            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("lm_beijing2");
+            _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("qrhd_banner_yxzy");
             _ui.m_DayList.itemRenderer = DayListRenderer;
             _ui.m_TaskList.itemRenderer = TaskListRenderer;
+            _ui.m_tip.onClick.Add(RuleController.ShowRuleView);
+            _ui.m_tip.data = 300014;
         }
 
         private void OnBtnBackClick()
@@ -56,6 +59,13 @@ namespace GFGGame
             SetScore();
             SetDayList();
             SetTasks();
+            SetTime();
+        }
+
+        public override void Hide()
+        {
+            Timers.inst.Remove(UpdateTime);
+            base.Hide();
         }
 
         private void SetScore()
@@ -245,5 +255,23 @@ namespace GFGGame
             if (!result) return;
             FreshGetStatus();
         }
+
+        private void SetTime()
+        {
+            Timers.inst.Add(1, 0, UpdateTime);
+        }
+
+        //UpdateTime
+        private void UpdateTime(object param)
+        {
+            var endTime = ActivityDay7DataManager.Instance.GetEndTime();
+            var leftTime = endTime - TimeHelper.ServerNow();
+            if (leftTime <= 0)
+            {
+                Timers.inst.Remove(UpdateTime);
+                return;
+            }
+            _ui.m_TimeStr.text = TimeUtil.FormattingTimeTo_DDHHmm((int)leftTime);
+        }
     }
 }

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

@@ -81,7 +81,7 @@ namespace GFGGame
             _ui.m_txtExchangeCount.visible = false;
             _ui.m_comCost.target.visible = false;
             _ui.m_listItem.numItems = itemCfg.itemsArr.Length;
-            _ui.m_listItem.visible = itemCfg.itemType == ConstItemType.GIFT_BAG && itemCfg.subType != ConstItemSubType.GIFT_BAG_AUTO;
+            _ui.m_listItem.visible = itemCfg.itemType == ConstItemType.USEABLE && itemCfg.subType != ConstItemSubType.USEABLE_AUTO;
         }
 
         private void UpdateUseView()

GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/EnduringGiftBoxView.cs

@@ -509,8 +509,8 @@ namespace GFGGame
             ShopCfg shopCfg = context.data as ShopCfg;
             var itemCfg = ItemCfgArray.Instance.GetCfg(shopCfg.itemId);
 
-            if (itemCfg.itemType == ConstItemType.GIFT_BAG &&
-                itemCfg.subType == ConstItemSubType.CONTINUOUS_REWARD_GIFT)
+            if (itemCfg.itemType == ConstItemType.USEABLE &&
+                itemCfg.funType == ConstItemFuncType.CONTINUOUS_REWARD_GIFT)
             {
                 int dayNum = EnduringGiftBoxDataManager.Instance.GetItemRebateDay(itemCfg.id);
                 int totalDayNum = dayNum + itemCfg.param2Arr[0];

GameClient/Assets/Game/HotUpdate/Views/Task/BattlePassTaskView.cs

@@ -213,7 +213,7 @@ namespace GFGGame
                 Timers.inst.Remove(UpdateTime);
                 return;
             }
-            _ui.m_LeftTime.text = TimeUtil.FormattingTimeTo_HHmmss((int)(seasonEndTime - TimeHelper.ServerNow()));
+            _ui.m_LeftTime.text = TimeUtil.FormattingTimeTo_DDHHmm((int)leftTime);
         }
 
         private void SetBattlePassLevel()

GameClient/Assets/ResIn/UI/CommonGame/CommonGame_atlas0_3!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 5d1ea15fa37f33d4ebfc3c3a0237cb28
+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
+  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/CommonGame/CommonGame_atlas0_3.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: dae78a600bebdcc4ca58d1b5e82bc413
+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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: