Pārlūkot izejas kodu

图鉴跳商店后无法返回

zhaoyang 2 gadi atpakaļ
vecāks
revīzija
c13e93d8af

+ 1 - 1
FGUIProject/assets/CommonGame/components/BtnStyle006.xml

@@ -8,7 +8,7 @@
     <text id="n1_9qpb" name="title" xy="0,0" size="316,94" font="ui://eg2y0ldpa0cftks" fontSize="46" color="#5a3e16" align="center" vAlign="middle" autoSize="none" singleLine="true" text="">
       <relation target="" sidePair="width-width,height-height,center-center,middle-middle"/>
     </text>
-    <graph id="n3_e050" name="holder" xy="158,51" size="10,10" type="rect"/>
+    <graph id="n3_e050" name="holder" xy="158,51" size="10,10"/>
   </displayList>
   <Button/>
   <relation target="n2_idkd" sidePair="width-width,height-height"/>

BIN
FGUIProject/assets/CommonGame/imagesExport/kp_kuang_1.png


BIN
FGUIProject/assets/CommonGame/imagesExport/kp_kuang_2.png


+ 2 - 2
FGUIProject/assets/CommonGame/package.xml

@@ -363,8 +363,8 @@
     <image id="e050to7" name="tb_yajizijin.png" path="/imgItemIcon/" exported="true"/>
     <image id="e050to8" name="tb_zhizaoli.png" path="/imgItemIcon/" exported="true"/>
     <component id="e050tob" name="Component2.xml" path="/componentsBg/"/>
-    <image id="94m19v" name="kp_kuang_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="40,110,51,220"/>
-    <image id="94m19u" name="kp_kuang_2.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="39,110,61,220"/>
+    <image id="94m19v" name="kp_kuang_2.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="40,110,51,220"/>
+    <image id="94m19u" name="kp_kuang_1.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="39,110,61,220"/>
     <image id="94m19t" name="kp_kuang_4.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="38,110,53,220"/>
     <image id="94m19w" name="kp_kuang_3.png" path="/imagesExport/" exported="true" scale="9grid" scale9grid="44,110,54,220"/>
     <image id="ofwutoc" name="card_jn_db.png" path="/imagesNew/" exported="true"/>

+ 1 - 1
FGUIProject/assets/LuckyBox/combox/ComBox1.xml

@@ -42,7 +42,7 @@
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n59_vols" name="imgSpecial" src="volstbn" fileName="imageNews/bt_jiaobiao_bichu.png" xy="865,1623" group="n84_e050"/>
-    <graph id="n83_e050" name="holder" xy="919,1675" size="10,10" group="n84_e050" type="rect"/>
+    <graph id="n83_e050" name="holder" xy="919,1675" size="10,10" group="n84_e050"/>
     <group id="n84_e050" name="grpSpecial" xy="865,1623" size="112,123" group="n61_vols" advanced="true">
       <relation target="n58_vols" sidePair="right-right,top-top"/>
     </group>

+ 6 - 7
GameClient/Assets/Game/HotUpdate/DressUp/SceneController.cs

@@ -119,16 +119,15 @@ namespace GFGGame
             _gameObject = DressUpUtil.CreateAnimationObj(res);
             _gameObject.transform.localScale = new Vector3(scale, scale, scale);
 
-            if (_wrapper == null)
-            {
-                _wrapper = new GoWrapper(_gameObject);
-                holder.SetNativeObject(_wrapper);
-            }
-            else
+            if (_wrapper != null)
             {
                 GameObject.Destroy(_wrapper.wrapTarget);
-                _wrapper.wrapTarget = _gameObject;//替换资源
+                _wrapper.Dispose();
             }
+
+            _wrapper = new GoWrapper(_gameObject);
+            holder.SetNativeObject(_wrapper);
+
             wrapper = _wrapper;
             gameObject = _gameObject;
         }

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/ApproachView.cs

@@ -178,7 +178,7 @@ namespace GFGGame
                     int storeSubId = int.Parse(infos[2]);
 
                     isJump = ViewManager.Show<StoreView>(new object[] { storeTabId, storeSubId });
-                    break;
+                    return;
                 // case ConstFunctionId.SHOP_GIFT_BAG:
                 //     // this.Hide();
                 //     int giftBagValue = int.Parse(infos[1]);

+ 1 - 22
GameClient/Assets/Game/HotUpdate/Views/LuckyBox/LuckyBoxView.cs

@@ -133,46 +133,25 @@ namespace GFGGame
 
             Timers.inst.AddUpdate(CheckGuide);
         }
-        // private string GetListItemResource(int index)
-        // {
-        //     if (index == 0 && _activeBoxId > 0)
-        //     {
-        //         return "UI://LuckyBox/ComBox";
-        //     }
-        //     else
-        //     {
-        //         int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
-        //         return string.Format("UI://LuckyBox/ComBox_{0}", boxId);
-        //     }
-        // }
+
         private void RenderListBgItem(int index, GObject obj)
         {
             int boxId = LuckyBoxDataManager.Instance.luckyBoxIds[index];
-            // LuckyBoxCfg cfg = LuckyBoxCfgArray.Instance.GetCfg(boxId);
-            // LuckyBoxDataManager.Instance.InitData(boxId);
-
-            // UI_ComBox1 comBox = UI_ComBox1.Proxy(obj);
-
 
-            // UI_ComBox1.ProxyEnd();
         }
 
         private void OnBtnLeftClick()
         {
             int index = _curIndex - 1;
-            // _curIndex--;
             index = Mathf.Max(0, index);
             _ui.m_listBg.ScrollToView(index, true);
-            // OnListBgScroll();
         }
 
         private void OnBtnRightClick()
         {
             int index = _curIndex + 1;
-            // _curIndex++;
             index = Mathf.Min(_ui.m_listBg.numItems - 1, index);
             _ui.m_listBg.ScrollToView(index, true);
-            // OnListBgScroll();
         }
 
         private void OnListBgScroll()

BIN
GameClient/Assets/ResIn/UI/CommonGame/CommonGame_fui.bytes


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