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

FGUIProject/assets/EnduringGiftBox/RushSaleGiftBoxUI.xml

@@ -19,7 +19,7 @@
     <text id="n13_yjmk" name="txtUrc" xy="453,623" size="224,68" group="n23_droi" fontSize="34" color="#b8857b" align="center" vAlign="middle" autoSize="shrink" text="今日限购0/1"/>
     <component id="n15_yjmk" name="btnBuyPink" src="yjmk2q" fileName="components/BtnBuyPink.xml" xy="408,693" group="n23_droi"/>
     <graph id="n25_droi" name="holderBtnBy" xy="570,744" size="46,29" group="n23_droi"/>
-    <graph id="n27_droi" name="holderZheKouChiXu" xy="394,692" size="33,33" group="n23_droi"/>
+    <graph id="n27_droi" name="holderZheKouChiXu" xy="394,692" size="33,33" group="n23_droi" visible="false"/>
     <component id="n14_yjmk" name="comDiscount" src="yjmk2r" fileName="components/ComDiscount2.xml" xy="333,642" group="n23_droi"/>
     <graph id="n26_droi" name="holderZheKou" xy="417,710" size="65,64" group="n23_droi"/>
     <text id="n16_yjmk" name="txtLrc" xy="379,787" size="380,46" group="n23_droi" fontSize="34" color="#b8857b" align="center" autoSize="shrink" text="可获得60充值经验"/>
@@ -28,14 +28,14 @@
     <graph id="n24_droi" name="holderPaoBaby" xy="263,282" size="86,77"/>
   </displayList>
   <transition name="t3">
-    <item time="0" type="Alpha" target="n11_yjmk" value="0"/>
+    <item time="0" type="Alpha" target="n11_yjmk" tween="true" startValue="0" endValue="1" duration="18" ease="Linear"/>
     <item time="0" type="Alpha" target="n12_yjmk" value="0"/>
     <item time="0" type="Alpha" target="n13_yjmk" value="0"/>
     <item time="0" type="Alpha" target="n14_yjmk" value="0"/>
     <item time="0" type="Alpha" target="n15_yjmk" value="0"/>
     <item time="0" type="Alpha" target="n16_yjmk" value="0"/>
     <item time="0" type="Alpha" target="n19_droi" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
-    <item time="0" type="Alpha" target="n1_yjmk" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
+    <item time="0" type="Alpha" target="n1_yjmk" tween="true" startValue="0" endValue="1" duration="13" ease="Linear"/>
     <item time="0" type="Alpha" target="n20_droi" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
     <item time="0" type="Alpha" target="n21_droi" tween="true" startValue="0" endValue="1" duration="27"/>
     <item time="0" type="Alpha" target="n2_yjmk" tween="true" startValue="0" endValue="1" duration="27" ease="Linear"/>
@@ -45,27 +45,28 @@
     <item time="0" type="Alpha" target="n6_yjmk" value="0"/>
     <item time="0" type="Alpha" target="n8_yjmk" value="0"/>
     <item time="0" type="Alpha" target="n8_yjmk" value="0"/>
+    <item time="0" type="Scale" target="n15_yjmk" tween="true" startValue="0.95,1" endValue="1,1" duration="17" ease="Quad.In"/>
     <item time="0" type="Scale" target="n24_droi" tween="true" startValue="0.95,0.95" endValue="1,1" duration="12" ease="Linear"/>
     <item time="0" type="Visible" target="n11_yjmk" value="false"/>
     <item time="0" type="Visible" target="n24_droi" value="false"/>
     <item time="0" type="Visible" target="n27_droi" value="false"/>
+    <item time="0" type="XY" target="n15_yjmk" tween="true" startValue="422,693" endValue="408,693" duration="17" ease="Linear"/>
     <item time="0" type="XY" target="n19_droi" tween="true" startValue="70,380" endValue="63,380" duration="10" ease="Linear"/>
     <item time="0" type="XY" target="n20_droi" tween="true" startValue="863,386" endValue="877,386" duration="12" ease="Linear"/>
     <item time="0" type="XY" target="n24_droi" tween="true" startValue="274,290" endValue="263,282" duration="12" ease="Linear"/>
     <item time="0" type="XY" target="n2_yjmk" tween="true" startValue="335,20" endValue="335,26" duration="11" ease="Linear"/>
+    <item time="6" type="Visible" target="n11_yjmk" value="true"/>
     <item time="6" type="Visible" target="n24_droi" value="true"/>
-    <item time="12" type="Alpha" target="n11_yjmk" tween="true" startValue="0.2" endValue="1" duration="14" ease="Linear"/>
+    <item time="10" type="Alpha" target="n15_yjmk" tween="true" startValue="0.2" endValue="1" duration="16" ease="Linear"/>
     <item time="12" type="Visible" target="n27_droi" value="true"/>
     <item time="15" type="Alpha" target="n12_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
     <item time="15" type="Alpha" target="n13_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
     <item time="15" type="Alpha" target="n14_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
-    <item time="15" type="Alpha" target="n15_yjmk" tween="true" startValue="0.2" endValue="1" duration="16" ease="Linear"/>
     <item time="15" type="Alpha" target="n16_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
     <item time="15" type="Alpha" target="n24_droi" tween="true" startValue="0" endValue="1" duration="19" ease="Linear"/>
     <item time="15" type="Alpha" target="n4_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Linear"/>
     <item time="15" type="Alpha" target="n5_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Quart.Out"/>
     <item time="15" type="Alpha" target="n6_yjmk" tween="true" startValue="0" endValue="1" duration="14" ease="Quint.Out"/>
     <item time="15" type="Alpha" target="n8_yjmk" tween="true" startValue="0.2" endValue="1" duration="19" ease="Quint.Out"/>
-    <item time="35" type="Visible" target="n11_yjmk" value="true"/>
   </transition>
 </component>

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

@@ -260,6 +260,12 @@ namespace GFGGame
             if (message.Type == LastQuestionResult.Ending)
             {
                 LeagueDataManager.Instance.SetNumeric(LeagueNumericType.LeagueQuestionStatus, LeagueQuestionStatus.AnswerEnd);
+                //弹窗
+                var rewards = ItemUtil.CreateItemDataList(message.Rewards);
+                if (rewards.Count > 0)
+                {
+                    BonusController.TryShowBonusList(rewards);
+                }
             }
             else
             {

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

@@ -27,13 +27,13 @@ namespace GFGGame
 
         private GameObject _gameObject1;
         private GameObject _gameObject2;
-        private GameObject _gameObject3;
+        // private GameObject _gameObject3;
         private GameObject _gameObject4;
         private GameObject _gameObject5;
 
         private GoWrapper _wrapper1;
         private GoWrapper _wrapper2;
-        private GoWrapper _wrapper3;
+        // private GoWrapper _wrapper3;
         private GoWrapper _wrapper4;
         private GoWrapper _wrapper5;
 
@@ -88,9 +88,9 @@ namespace GFGGame
             SceneController.AddObjectToView(null, null, _ui.m_holderPaoBaby, resPath1,
                 out _gameObject1, out _wrapper1);
 
-            string resPath3 = ResPathUtil.GetViewEffectPath("ui_Activity", "Limite_discount_chixu");
-            SceneController.AddObjectToView(null, null, _ui.m_holderZheKouChiXu, resPath3,
-                out _gameObject3, out _wrapper3);
+            // string resPath3 = ResPathUtil.GetViewEffectPath("ui_Activity", "Limite_discount_chixu");
+            // SceneController.AddObjectToView(null, null, _ui.m_holderZheKouChiXu, resPath3,
+            //     out _gameObject3, out _wrapper3);
 
             Timers.inst.Add(0.8f, 1, (obj) =>
                 {
@@ -376,7 +376,7 @@ namespace GFGGame
         {
             SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
             SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
-            SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
+            // SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
             SceneController.DestroyObjectFromView(_gameObject4, _wrapper4);
             SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
             DestroyObjectFromView();