Merge remote-tracking branch 'remotes/origin/master' into ios_test

# Conflicts:
#	GameClient/Assets/Game/HotUpdate/Platform/QDAppStoreManager.cs
#	GameClient/Assets/Game/HotUpdate/Platform/QDAppStoreManager.cs.meta
#	GameClient/Assets/Game/Launcher/Platform/ATTAuth.cs.meta
#	GameClient/Assets/Game/Launcher/Platform/QDAppStoreManagerInit.cs.meta
#	GameClient/Assets/ResIn/UI/ActivityThemeLuckyBox/ActivityThemeLuckyBox_fui.bytes

GameClient/Assets/Editor/ToolsMenu.cs

@@ -34,6 +34,12 @@ namespace GFGEditor
         {
             
         }
+#elif PT_DouYouDev
+        [MenuItem("PT_DouYouDev/")]
+        public static void VersionTag()
+        {
+            
+        }
 #elif PT_DOUYOU
         [MenuItem("DouYou/")]
         public static void VersionTag()

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityThemeLuckyBox/UI_ActivityThemeLuckyBoxUI.cs

@@ -19,6 +19,10 @@ namespace UI.ActivityThemeLuckyBox
         public GTextField m_txtTime_4;
         public GButton m_btnLuckyBox_old;
         public UI_Button1 m_btnLuckyBox;
+        public GImage m_mask;
+        public GLoader m_icon_5;
+        public GTextField m_txtTime_5;
+        public GGraph m_textEffect;
         public Transition m_In_2;
         public Transition m_In_4;
         public const string URL = "ui://ubfk2kobmbf1k";
@@ -80,6 +84,10 @@ namespace UI.ActivityThemeLuckyBox
             m_txtTime_4 = (GTextField)comp.GetChild("txtTime_4");
             m_btnLuckyBox_old = (GButton)comp.GetChild("btnLuckyBox_old");
             m_btnLuckyBox = (UI_Button1)UI_Button1.Create(comp.GetChild("btnLuckyBox"));
+            m_mask = (GImage)comp.GetChild("mask");
+            m_icon_5 = (GLoader)comp.GetChild("icon_5");
+            m_txtTime_5 = (GTextField)comp.GetChild("txtTime_5");
+            m_textEffect = (GGraph)comp.GetChild("textEffect");
             m_In_2 = comp.GetTransition("In_2");
             m_In_4 = comp.GetTransition("In_4");
         }
@@ -101,6 +109,10 @@ namespace UI.ActivityThemeLuckyBox
             m_btnLuckyBox_old = null;
             m_btnLuckyBox.Dispose();
             m_btnLuckyBox = null;
+            m_mask = null;
+            m_icon_5 = null;
+            m_txtTime_5 = null;
+            m_textEffect = null;
             m_In_2 = null;
             m_In_4 = null;
             if(disposeTarget && target != null)

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxWishUI.cs

@@ -8,6 +8,7 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public Controller m_showType;
+        public GLoader m_bg;
         public GButton m_btnWish1;
         public GButton m_btnWish2;
         public GButton m_btnRule;
@@ -63,6 +64,7 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_showType = comp.GetController("showType");
+            m_bg = (GLoader)comp.GetChild("bg");
             m_btnWish1 = (GButton)comp.GetChild("btnWish1");
             m_btnWish2 = (GButton)comp.GetChild("btnWish2");
             m_btnRule = (GButton)comp.GetChild("btnRule");
@@ -74,6 +76,7 @@ namespace UI.LuckyBox
         public void Dispose(bool disposeTarget = false)
         {
             m_showType = null;
+            m_bg = null;
             m_btnWish1 = null;
             m_btnWish2 = null;
             m_btnRule = null;

GameClient/Assets/Game/HotUpdate/Platform/QDManager.cs

@@ -24,6 +24,11 @@ namespace GFGGame
                     QDDouYouManager.Instance.Init();
                     QDShareManager.Instance.Init();
                     break;
+                case (int)ChannelID.AppStore:
+#if !UNITY_EDITOR && UNITY_IOS
+                    QDAppStoreManager.Init();
+#endif
+                    break;
                 default:
                     break;
             }
@@ -49,6 +54,9 @@ namespace GFGGame
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.Login();
                     break;
+                case (int)ChannelID.AppStore:
+                    //TODO 接douyou ios的sdk登录
+                    break;
                 default:
                     break;
             }
@@ -85,6 +93,9 @@ namespace GFGGame
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.OnEnterGame();
                     break;
+                case (int)ChannelID.AppStore:
+                    //TODO 接入douYou sdk 
+                    break;
                 default:
                     break;
             }
@@ -104,6 +115,9 @@ namespace GFGGame
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.OnQuitToLoginView();
                     break;
+                case (int)ChannelID.AppStore:
+                    //TODO 接入douYou sdk 
+                    break;
                 default:
                     break;
             }
@@ -122,6 +136,9 @@ namespace GFGGame
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.Pay(buyID, count, orderID, price);
                     break;
+                case (int)ChannelID.AppStore:
+                    //TODO 接入douYou sdk 
+                    break;
                 default:
                     break;
             }
@@ -148,6 +165,9 @@ namespace GFGGame
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.Logout();
                     break;
+                case (int)ChannelID.AppStore:
+                    //TODO 接入douYou sdk 
+                    break;
                 default:
                     break;
             }
@@ -166,6 +186,9 @@ namespace GFGGame
                 case (int)ChannelID.DouYouDev:
                     QDDouYouManager.Instance.Exit();
                     break;
+                case (int)ChannelID.AppStore:
+                    //TODO 接入douYou sdk 
+                    break;
                 default:
                     break;
             }
@@ -224,6 +247,9 @@ namespace GFGGame
                         roleInfoDev.Id.ToString(), lvlDev.ToString(), roleInfoDev.Name, roleInfoDev.ServerId.ToString(),
                         serverNameDev);
                     break;
+                case (int)ChannelID.AppStore:
+                    //TODO 接入douYou sdk 
+                    break;
                 default:
                     break;
             }

GameClient/Assets/Game/HotUpdate/Views/ActivityThemeLuckyBox/ActivityThemeLuckyBoxView.cs

@@ -209,6 +209,13 @@ namespace GFGGame
                 _effectUIDic.Add("L", EffectUIPool.CreateEffectUI(_ui.m_btnLuckyBox.m_effectHolder, "ui_Activity", "SYJH_icon_tx_L"));
                 _effectUIDic.Add("R", EffectUIPool.CreateEffectUI(_ui.m_btnChapter.m_effectHolder, "ui_Activity", "SYJH_icon_tx_R"));
             }
+            else if (_activityId == 5)
+            {
+                _effectUIDic.Add("All_tx", EffectUIPool.CreateEffectUI(_ui.m_bgEffectHolder, "ui_Activity/JFYL_All_tx", "JFYL_All_tx"));
+                _effectUIDic.Add("L", EffectUIPool.CreateEffectUI(_ui.m_btnLuckyBox.m_effectHolder, "ui_Activity/JFYL_Button_L", "JFYL_Button_L"));
+                _effectUIDic.Add("R", EffectUIPool.CreateEffectUI(_ui.m_btnChapter.m_effectHolder, "ui_Activity/JFYL_Button_R", "JFYL_Button_R"));
+                _effectUIDic.Add("textEff", EffectUIPool.CreateEffectUI(_ui.m_textEffect, "ui_Activity/JFYL_Text", "JFYL_Text"));
+            }
         }
         private void PreloadSuitModel()
         {

GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -126,8 +126,9 @@ namespace GFGGame
             item.m_loaTitle.visible = true;
             if (ActivityDataManager.Instance.actLimitChargeId > 0)
             {
-                item.m_loaIcon.url = "ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
-                item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
+                string path  = "xslc_" + openCfg.res;
+                item.m_loaIcon.url = ResPathUtil.GetActivityPath(path);//"ui://DailyWelfare/hdbn_xslc_" + openCfg.res;
+                //item.m_loaTitle.url = "ui://DailyWelfare/hdbn_wz_xslc_" + openCfg.res;
                 item.m_loaTitle.visible = false;
             }
             else if (openCfg.id == 501)
@@ -163,7 +164,7 @@ namespace GFGGame
             GObject gObject = context.sender as GObject;
             int id = (int)gObject.data;
             ActivityOpenCfg cfg = ActivityOpenCfgArray.Instance.GetCfg(id);
-            if (id == 501 || id == 502 || cfg.type == 10)
+            if (id == 501 || id == 502 || cfg.type == 10 || cfg.type == 2)
             {
                 ViewManager.Show<NewLimitChargeView>(new object[] { gObject.data });
                 return;

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

@@ -53,9 +53,17 @@ namespace GFGGame
             base.OnShown();
             _actLimitTsy = (int)this.viewData;
             if (_actLimitTsy == ConstLimitTimeActivityType.ActLimitStlyc)
+            {
                 _ui.m_showType.selectedIndex = 1;
+            }
+            else if(_actLimitTsy == 1)
+            {
+                _ui.m_showType.selectedIndex = 2;
+            }
             else
+            {
                 _ui.m_showType.selectedIndex = 0;
+            }
 
             int activityId = ActivityDataManager.Instance.GetCurOpenActiveByType(_actLimitTsy);
             ActivityOpenCfg activityOpenCfg = ActivityOpenCfgArray.Instance.GetCfg(activityId);

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -71,6 +71,10 @@ namespace GFGGame
             //外网dev版本
             netType = EnumNetType.LOCAL;
             cfgName = "cfg_dev";
+            ChannelId = (int)ChannelID.Test;
+#elif PT_DouYouDev
+            netType = EnumNetType.LOCAL;
+            cfgName = "cfg_douYouDev";
             ChannelId = (int)ChannelID.DouYouDev;
 #elif PT_TAPTAP
             netType = EnumNetType.PUBLIC;

GameClient/Assets/Game/Launcher/Platform/QDManagerInit.cs

@@ -17,6 +17,9 @@ namespace GFGGame.Launcher
                     QDDouYouManagerInit.Instance.InitSDK(LauncherConfig.douYouAdId);
                     QDShareManagerInit.Instance.InitSDK();
                     break;
+                case (int)ChannelID.AppStore:
+                    QDAppStoreManagerInit.InitPlatform();
+                    break;
                 default:
                     UniEvent.SendMessage(new LauncherEvent.InitPlatformResult() { success = true });
                     QDShareManagerInit.Instance.InitSDK();

GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas0_8!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 9f28c29f9407c1344932c40e14aeb496
+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/LuckyBox/LuckyBox_atlas0_8.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 87b44ee28f2a8e743b1bb0ee4f6b44ef
+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: