zhaoyang 3 жил өмнө
parent
commit
99289cb147

+ 3 - 0
FGUIProject/assets/LuckyBox/LuckyBoxStarUI.xml

@@ -64,5 +64,8 @@
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
       <gearDisplay2 controller="ctrlRewardsType" pages="2" condition="0"/>
       <relation target="" sidePair="left-center,top-middle"/>
       <relation target="" sidePair="left-center,top-middle"/>
     </group>
     </group>
+    <movieclip id="n49_hibu" name="effEnd" src="hibu2m" fileName="effect/MovieClip3.jta" xy="0,0" size="1080,1920" visible="false">
+      <relation target="" sidePair="width-width,height-height"/>
+    </movieclip>
   </displayList>
   </displayList>
 </component>
 </component>

BIN
FGUIProject/assets/LuckyBox/effect/MovieClip3.jta


+ 1 - 11
FGUIProject/assets/LuckyBox/package.xml

@@ -53,17 +53,7 @@
     <image id="qr4e29" name="wpzs_yhd.png" path="/images/"/>
     <image id="qr4e29" name="wpzs_yhd.png" path="/images/"/>
     <image id="cs8j2a" name="cj_bj_6.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="cs8j2a" name="cj_bj_6.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="cs8j2b" name="cj_bj_5.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
     <image id="cs8j2b" name="cj_bj_5.jpg" path="/imagesExport/" exported="true" atlas="alone_npot"/>
-    <movieclip id="hibu2m" name="MovieClip3.jta" path="/effect/"/>
-    <image id="hibu2n" name="001.png" path="/effect/"/>
-    <image id="hibu2o" name="010.png" path="/effect/"/>
-    <image id="hibu2p" name="002.png" path="/effect/"/>
-    <image id="hibu2q" name="003.png" path="/effect/"/>
-    <image id="hibu2r" name="004.png" path="/effect/"/>
-    <image id="hibu2s" name="005.png" path="/effect/"/>
-    <image id="hibu2t" name="006.png" path="/effect/"/>
-    <image id="hibu2u" name="007.png" path="/effect/"/>
-    <image id="hibu2v" name="008.png" path="/effect/"/>
-    <image id="hibu2w" name="009.png" path="/effect/"/>
+    <movieclip id="hibu2m" name="MovieClip3.jta" path="/effect/" atlas="alone_npot"/>
   </resources>
   </resources>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
   <publish name="" path="..\GameClient\Assets\ResIn\UI\LuckyBox" packageCount="2" genCode="true" extractAlpha="true"/>
 </packageDescription>
 </packageDescription>

+ 3 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxStarUI.cs

@@ -43,6 +43,7 @@ namespace UI.LuckyBox
         public UI_ComStar m_comStar1_2_7;
         public UI_ComStar m_comStar1_2_7;
         public UI_ComStar m_comStar1_2_8;
         public UI_ComStar m_comStar1_2_8;
         public GGroup m_grpComStar2;
         public GGroup m_grpComStar2;
+        public GMovieClip m_effEnd;
         public const string URL = "ui://drx9d1usl5nzm";
         public const string URL = "ui://drx9d1usl5nzm";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxStarUI";
         public const string RES_NAME = "LuckyBoxStarUI";
@@ -126,6 +127,7 @@ namespace UI.LuckyBox
             m_comStar1_2_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_7"));
             m_comStar1_2_7 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_7"));
             m_comStar1_2_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_8"));
             m_comStar1_2_8 = (UI_ComStar)UI_ComStar.Create(comp.GetChild("comStar1_2_8"));
             m_grpComStar2 = (GGroup)comp.GetChild("grpComStar2");
             m_grpComStar2 = (GGroup)comp.GetChild("grpComStar2");
+            m_effEnd = (GMovieClip)comp.GetChild("effEnd");
         }
         }
         public void Dispose(bool disposeTarget = false)
         public void Dispose(bool disposeTarget = false)
         {
         {
@@ -194,6 +196,7 @@ namespace UI.LuckyBox
             m_comStar1_2_8.Dispose();
             m_comStar1_2_8.Dispose();
             m_comStar1_2_8 = null;
             m_comStar1_2_8 = null;
             m_grpComStar2 = null;
             m_grpComStar2 = null;
+            m_effEnd = null;
             if(disposeTarget && target != null)
             if(disposeTarget && target != null)
             {
             {
                 target.RemoveFromParent();
                 target.RemoveFromParent();

+ 6 - 4
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusView.cs

@@ -13,8 +13,8 @@ namespace GFGGame
         private List<GameObject> _effects = new List<GameObject>();
         private List<GameObject> _effects = new List<GameObject>();
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
 
 
-        private GameObject _effect = new GameObject();
-        private GoWrapper _wrapper = new GoWrapper();
+        private GameObject _effect;
+        private GoWrapper _wrapper;
         public override void Dispose()
         public override void Dispose()
         {
         {
             base.Dispose();
             base.Dispose();
@@ -48,7 +48,8 @@ namespace GFGGame
                 SceneController.AddObjectToView(null, null, holder, resPath, out gameObject0, out wrapper0);
                 SceneController.AddObjectToView(null, null, holder, resPath, out gameObject0, out wrapper0);
                 _effects.Add(gameObject0);
                 _effects.Add(gameObject0);
             }
             }
-            SceneController.AddObjectToView(_effect, _wrapper, _ui.m_itemOne.GetChild("holder").asGraph, resPath, out _effect, out _wrapper);
+            GGraph holder1 = _ui.target.GetChild("itemOne").asCom.GetChild("holder").asGraph;
+            SceneController.AddObjectToView(null, null, holder1, resPath, out _effect, out _wrapper);
 
 
         }
         }
 
 
@@ -132,7 +133,8 @@ namespace GFGGame
         {
         {
             HideAllItem();
             HideAllItem();
             _ui.m_itemOne.visible = true;
             _ui.m_itemOne.visible = true;
-            UpdateItem(UI_LuckyBoxBonusItem.Proxy(_ui.m_itemOne), itemData);
+            UI_LuckyBoxBonusItem itemUI = UI_LuckyBoxBonusItem.Proxy(_ui.m_itemOne);
+            UpdateItem(itemUI, itemData);
             _ui.m_bg.touchable = true;
             _ui.m_bg.touchable = true;
         }
         }
 
 

+ 30 - 23
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxStarView.cs

@@ -70,7 +70,7 @@ namespace GFGGame
             _ui.target.onTouchBegin.Add(OnClickUIBegin);
             _ui.target.onTouchBegin.Add(OnClickUIBegin);
             _ui.target.onTouchMove.Add(OnClickUIMove);
             _ui.target.onTouchMove.Add(OnClickUIMove);
             _ui.target.onTouchEnd.Add(OnClickUIEnd);
             _ui.target.onTouchEnd.Add(OnClickUIEnd);
-
+            _ui.m_effEnd.visible = false;
             _rewardList = LuckyBoxDataManager.Instance.RewardList;
             _rewardList = LuckyBoxDataManager.Instance.RewardList;
             _ui.m_ctrlBuyType.selectedIndex = _rewardList != null && _rewardList.Count > 1 ? 1 : 0;
             _ui.m_ctrlBuyType.selectedIndex = _rewardList != null && _rewardList.Count > 1 ? 1 : 0;
             _ui.m_ctrlRewardsType.selectedIndex = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.Instance.currentBoxId);
             _ui.m_ctrlRewardsType.selectedIndex = Array.IndexOf(LuckyBoxDataManager.Instance.luckyBoxIds, LuckyBoxDataManager.Instance.currentBoxId);
@@ -109,6 +109,10 @@ namespace GFGGame
                 gcom2.visible = false;
                 gcom2.visible = false;
                 comStar.target.AddChildAt(gcom2, 3);
                 comStar.target.AddChildAt(gcom2, 3);
 
 
+                GComponent gcom3 = CreateEffect(comStar, 4, "ui_ck_dj_2");
+                gcom3.visible = false;
+                comStar.target.AddChildAt(gcom3, 4);
+
 
 
 
 
                 star.data = new Vector2(comStar.target.x, comStar.target.y);
                 star.data = new Vector2(comStar.target.x, comStar.target.y);
@@ -226,18 +230,10 @@ namespace GFGGame
             else
             else
             {
             {
                 CheckNotClickComStar();
                 CheckNotClickComStar();
-                // SetComStarDarken();
+                SetComStarDarken();
 
 
-                for (int i = 0; i < notClickComStars.Count; i++)
-                {
-                    UI_ComStar notClickComStar = UI_ComStar.Proxy(notClickComStars[i]);
-                    notClickComStar.m_imgLine.visible = false;
-                    notClickComStar.target.GetChildAt(3).asCom.visible = true;
-                    notClickComStar.target.GetChildAt(1).asCom.visible = false;
-                }
+                Timers.inst.Add(1f, 1, SetClickComStarAni);
 
 
-                Timers.inst.Add(2f, 1, ClickUIEnd);
-                TryCompleteGuide();
 
 
             }
             }
         }
         }
@@ -256,27 +252,38 @@ namespace GFGGame
                 star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
                 star = _ui.target.GetChild(string.Format("comStar{0}_{1}_{2}", _ui.m_ctrlBuyType.selectedIndex, _ui.m_ctrlRewardsType.selectedIndex, index));
             }
             }
         }
         }
-        private void UpdateComStarDarken(object param)
-        {
-            // Timers.inst.Remove(UpdateComStarDarken);
-
 
 
-        }
         private void SetComStarDarken()
         private void SetComStarDarken()
         {
         {
-            if (notClickComStars.Count == 0) return;
+
+            for (int i = 0; i < notClickComStars.Count; i++)
+            {
+                UI_ComStar notClickComStar = UI_ComStar.Proxy(notClickComStars[i]);
+                notClickComStar.m_imgLine.visible = false;
+                notClickComStar.target.GetChildAt(3).asCom.visible = true;
+                notClickComStar.target.GetChildAt(1).asCom.visible = false;
+            }
 
 
         }
         }
 
 
-        private void SetClickComStarAni()
+        private void SetClickComStarAni(object param)
         {
         {
-            //             for (int i = 0; i < clickComStars.Count; i++)
-            //             {
-            //                 UI_ComStar comStar = UI_ComStar.Proxy(clickComStars[i]);
-            // comStar.
-            //             }
+            for (int i = 0; i < clickComStars.Count; i++)
+            {
+                UI_ComStar comStar = UI_ComStar.Proxy(clickComStars[i]);
+                comStar.target.GetChildAt(4).asCom.visible = true;
+            }
+            Timers.inst.Add(0.5f, 1, SetEndEffect);
         }
         }
+        private void SetEndEffect(object param)
+        {
+            _ui.m_effEnd.visible = true;
+            _ui.m_effEnd.SetPlaySettings(0, -1, 1, -1);
 
 
+            Timers.inst.Add(0.6f, 1, ClickUIEnd);
+            // ClickUIEnd(null);
+            TryCompleteGuide();
+        }
         private void ClickUIEnd(object param)
         private void ClickUIEnd(object param)
         {
         {
             if (curComStar != null)
             if (curComStar != null)

BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_hibu2m!a.png


+ 96 - 0
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_hibu2m!a.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 72c695b5422c302439c034a86254b0b0
+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: 

BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_hibu2m.png


+ 96 - 0
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_atlas_hibu2m.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 277d5c434dbc61f44bfc5d42129145ae
+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: 

BIN
GameClient/Assets/ResIn/UI/LuckyBox/LuckyBox_fui.bytes