zhaoyang 2 жил өмнө
parent
commit
a5ea45e5ec

+ 6 - 6
FGUIProject/assets/LuckyBox/components/Component2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="385,385">
-  <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
+  <controller name="c1" pages="0,,1,,2,,3,,4," selected="1"/>
   <displayList>
     <image id="n10_v95q" name="n10" src="v95q2u" fileName="images/cj_hd_hdh_1.png" xy="58,60" group="n9_v95q">
       <gearDisplay controller="c1" pages="0,4"/>
@@ -17,19 +17,19 @@
     <loader id="n3_ga16" name="icon" xy="115,120" size="158,158" group="n9_v95q" aspect="true" align="center" vAlign="middle" fill="scale" shrinkOnly="true"/>
     <loader id="n4_ga16" name="rarity" xy="272,68" size="42,96" group="n9_v95q" url="ui://eg2y0ldpd4iw52"/>
     <image id="n7_pzq1" name="imgNew" src="r9ril" fileName="imagesExport/grxx_xinxin.png" pkg="eg2y0ldp" xy="76,99" group="n9_v95q" visible="false"/>
-    <image id="n14_v95q" name="n14" src="v95q33" fileName="images/cj_hd_zik_1.png" xy="100,270" group="n9_v95q">
+    <image id="n14_v95q" name="n14" src="v95q33" fileName="images/cj_hd_zik_1.png" xy="67,268" group="n9_v95q">
       <gearDisplay controller="c1" pages="0,4"/>
     </image>
-    <image id="n15_v95q" name="n15" src="v95q34" fileName="images/cj_hd_zik_2.png" xy="100,270" group="n9_v95q">
+    <image id="n15_v95q" name="n15" src="v95q34" fileName="images/cj_hd_zik_2.png" xy="67,268" group="n9_v95q">
       <gearDisplay controller="c1" pages="3"/>
     </image>
-    <image id="n16_v95q" name="n16" src="v95q35" fileName="images/cj_hd_zik_3.png" xy="100,270" group="n9_v95q">
+    <image id="n16_v95q" name="n16" src="v95q35" fileName="images/cj_hd_zik_3.png" xy="67,268" group="n9_v95q">
       <gearDisplay controller="c1" pages="2"/>
     </image>
-    <image id="n17_v95q" name="n17" src="v95q36" fileName="images/cj_hd_zik_4.png" xy="100,270" group="n9_v95q">
+    <image id="n17_v95q" name="n17" src="v95q36" fileName="images/cj_hd_zik_4.png" xy="67,268" group="n9_v95q">
       <gearDisplay controller="c1" pages="1"/>
     </image>
-    <text id="n2_ga16" name="txtName" xy="106,267" pivot="0.5,0" size="172,39" group="n9_v95q" fontSize="28" color="#bf9e73" align="center" text="岭南荔夏·闲">
+    <text id="n2_ga16" name="txtName" xy="106,268" pivot="0.5,0" size="172,39" group="n9_v95q" fontSize="28" color="#b0967d" align="center" text="岭南荔夏·闲">
       <gearColor controller="c1" pages="0,1,2,3,4" values="#bf9e73,#000000|#b0967d,#000000|#939b89,#000000|#89a2b0,#000000|#bf9e73,#000000"/>
       <relation target="" sidePair="center-center"/>
     </text>

+ 13 - 19
FGUIProject/assets/LuckyBox/components/LuckyBoxBonusItem.xml

@@ -1,36 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="385,385" pivot="0.5,0.5" anchor="true">
-  <controller name="c1" pages="0,,1,,2,,3,,4," selected="0"/>
+  <controller name="c1" pages="0,,1,,2,,3,,4," selected="1"/>
+  <controller name="c2" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n13_v95q" name="n13" src="v95q2t" fileName="images/cj_glglgl.png" xy="0,0"/>
     <image id="n9_v95q" name="n9" src="v95q2y" fileName="images/cj_hd_kdi_1.png" xy="58,60" pivot="0.5,0.5">
-      <gearDisplay controller="c1" pages="0,4"/>
+      <gearDisplay controller="c1" pages="4"/>
+      <gearDisplay2 controller="c2" pages="0" condition="0"/>
     </image>
     <image id="n10_v95q" name="n10" src="v95q2z" fileName="images/cj_hd_kdi_2.png" xy="58,60" pivot="0.5,0.5">
       <gearDisplay controller="c1" pages="3"/>
+      <gearDisplay2 controller="c2" pages="0" condition="0"/>
     </image>
     <image id="n11_v95q" name="n11" src="v95q30" fileName="images/cj_hd_kdi_3.png" xy="58,60" pivot="0.5,0.5">
       <gearDisplay controller="c1" pages="2"/>
+      <gearDisplay2 controller="c2" pages="0" condition="0"/>
     </image>
     <image id="n12_v95q" name="n12" src="v95q31" fileName="images/cj_hd_kdi_4.png" xy="58,60" pivot="0.5,0.5">
       <gearDisplay controller="c1" pages="1"/>
+      <gearDisplay2 controller="c2" pages="0" condition="0"/>
     </image>
-    <component id="n1_ga16" name="comIcon" src="dcrotaa" fileName="components/Component2.xml" xy="192,192" pivot="0.5,0.5" anchor="true"/>
-    <graph id="n8_dcro" name="holder" xy="192,192" size="1,1" visible="false" touchable="false" type="rect"/>
+    <component id="n1_ga16" name="comIcon" src="dcrotaa" fileName="components/Component2.xml" xy="192,192" pivot="0.5,0.5" anchor="true">
+      <gearDisplay controller="c2" pages="1"/>
+    </component>
+    <graph id="n8_dcro" name="holder" xy="192,192" size="1,1" visible="false" touchable="false" type="rect">
+      <gearDisplay controller="c2" pages="1"/>
+    </graph>
   </displayList>
-  <transition name="t0">
-    <item time="0" type="Skew" target="n10_v95q" value="0,0"/>
-    <item time="0" type="Skew" target="n11_v95q" value="0,0"/>
-    <item time="0" type="Skew" target="n12_v95q" value="0,0"/>
-    <item time="0" type="Skew" target="n1_ga16" value="0,-90"/>
-    <item time="0" type="Skew" target="n9_v95q" value="0,0"/>
-  </transition>
-  <transition name="t1">
-    <item time="0" type="Skew" target="n10_v95q" tween="true" startValue="0,-180" endValue="0,-90" duration="11" ease="Linear"/>
-    <item time="0" type="Skew" target="n11_v95q" tween="true" startValue="0,-180" endValue="0,-90" duration="11" ease="Linear"/>
-    <item time="0" type="Skew" target="n12_v95q" tween="true" startValue="0,-180" endValue="0,-90" duration="11" ease="Linear"/>
-    <item time="0" type="Skew" target="n1_ga16" value="0,-90"/>
-    <item time="0" type="Skew" target="n9_v95q" tween="true" startValue="0,-180" endValue="0,-90" duration="11" ease="Linear"/>
-    <item time="12" type="Skew" target="n1_ga16" tween="true" startValue="0,-90" endValue="0,0" duration="11" ease="Linear"/>
-  </transition>
 </component>

BIN
FGUIProject/assets/LuckyBox/images/cj_hd_zik_1.png


BIN
FGUIProject/assets/LuckyBox/images/cj_hd_zik_2.png


BIN
FGUIProject/assets/LuckyBox/images/cj_hd_zik_3.png


BIN
FGUIProject/assets/LuckyBox/images/cj_hd_zik_4.png


+ 3 - 6
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/LuckyBox/UI_LuckyBoxBonusItem.cs

@@ -8,10 +8,9 @@ namespace UI.LuckyBox
     {
         public GComponent target;
         public Controller m_c1;
+        public Controller m_c2;
         public UI_Component2 m_comIcon;
         public GGraph m_holder;
-        public Transition m_t0;
-        public Transition m_t1;
         public const string URL = "ui://drx9d1usga16g";
         public const string PACKAGE_NAME = "LuckyBox";
         public const string RES_NAME = "LuckyBoxBonusItem";
@@ -60,19 +59,17 @@ namespace UI.LuckyBox
         private void Init(GComponent comp)
         {
             m_c1 = comp.GetController("c1");
+            m_c2 = comp.GetController("c2");
             m_comIcon = (UI_Component2)UI_Component2.Create(comp.GetChild("comIcon"));
             m_holder = (GGraph)comp.GetChild("holder");
-            m_t0 = comp.GetTransition("t0");
-            m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_c1 = null;
+            m_c2 = null;
             m_comIcon.Dispose();
             m_comIcon = null;
             m_holder = null;
-            m_t0 = null;
-            m_t1 = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 15 - 7
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxBonusView.cs

@@ -16,20 +16,19 @@ namespace GFGGame
         private int openIndex = 0;
         // private List<int> openIndexList = new List<int>();
 
-        private List<GameObject> _effects = new List<GameObject>();
+        private List<GameObject> _gameobjects = new List<GameObject>();
         private List<GoWrapper> _wrappers = new List<GoWrapper>();
-
-        private GameObject _effect;
+        private GameObject _gameobject;
         private GoWrapper _wrapper;
         public override void Dispose()
         {
             base.Dispose();
-            for (int i = 0; i < _effects.Count; i++)
+            for (int i = 0; i < _gameobjects.Count; i++)
             {
-                SceneController.DestroyObjectFromView(_effects[i], _wrappers[i]);
+                SceneController.DestroyObjectFromView(_gameobjects[i], _wrappers[i]);
 
             }
-            SceneController.DestroyObjectFromView(_effect, _wrapper);
+            SceneController.DestroyObjectFromView(_gameobject, _wrapper);
 
             if (_ui != null)
             {
@@ -51,6 +50,14 @@ namespace GFGGame
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("bj_ckzxin");
             _ui.m_loaOpen.onClick.Add(OnClickOpen);
             _ui.m_btnPass.onClick.Add(OnBtnPassClick);
+            string resPath = ResPathUtil.GetViewEffectPath("ui_ck", "ui_ck_fk");
+            SceneController.AddObjectToView(null, null, _ui.m_itemOne.m_holder, resPath, out _gameobject, out _wrapper);
+            for (int i = 0; i < 10; i++)
+            {
+                SceneController.AddObjectToView(null, null, _ui.m_itemOne.m_holder, resPath, out GameObject gameobject, out GoWrapper wrapper);
+                _gameobjects.Add(gameobject);
+                _wrappers.Add(wrapper);
+            }
         }
 
         protected override void OnShown()
@@ -160,7 +167,8 @@ namespace GFGGame
             itemUI.m_comIcon.m_icon.data = itemData.id;
             itemUI.target.data = itemData;
             // itemUI.m_comIcon.target.SetScale(0, 0);
-            itemUI.m_t0.Play();
+            // itemUI.m_t0.Play();
+            itemUI.m_c2.selectedIndex = 0;
             UI_LuckyBoxBonusItem.ProxyEnd();
         }
 

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


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


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