合成问题修改

GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameView.cs

@@ -162,6 +162,7 @@ namespace GFGGame
                             guideAfuBtn = itemList[i][j];
                             itemList[i][j].GetChild("icon").icon = "ui://MiniGame/doubao_txkicon";
                             itemList[i][j].onClick.Add(OnClickDouBaoBtn);
+                            itemList[i][j].draggable = false;
                             continue;
                         }
                         if ( j == itemNum - 1)
@@ -169,6 +170,7 @@ namespace GFGGame
                             guideAfuBtn = itemList[i][j];
                             itemList[i][j].GetChild("icon").icon = "ui://MiniGame/afu_txkicon";
                             itemList[i][j].onClick.Add(OnClickAFuBtn);
+                            itemList[i][j].draggable = false;
                             continue;
                         }
                     }
@@ -194,7 +196,7 @@ namespace GFGGame
                     if (idList[i][j] == 0)
                     {
                         itemList[i][j].GetChild("icon").icon = "";
-                        itemList[i][j].draggable = false;
+                        //itemList[i][j].draggable = false;
                     }
                     else
                     {
@@ -282,26 +284,26 @@ namespace GFGGame
                 indexID = 0;
             }
 
+            //if (indexID == 0)
+            //{
+            //    item.draggable = false;
+            //}
+            //if(itemEndInfo > 0 )
+            //{
+            //    itemList[endIndexX][endIndexY].draggable = true;
+            //}
+
+            _ui.m_rangeTop.RemoveChild(item);
+            _ui.m_rangeDown.AddChild(item);
             item.x = startX;
             item.y = startY;
+            UpdateShowList();
 
-            if(indexID == 0)
-            {
-                item.draggable = false;
-            }
-            if(itemEndInfo > 0 )
-            {
-                itemList[endIndexX][endIndexY].draggable = true;
-            }
             startX = 0;
             startY = 0;
             indexX = 0;
             indexY = 0;
             indexID = 0;
-
-            _ui.m_rangeTop.RemoveChild(item);
-            _ui.m_rangeDown.AddChild(item);
-
         }
 
         private void OnClickItem(EventContext context)
@@ -551,6 +553,7 @@ namespace GFGGame
                 for (int j = 0; j < itemNum; j++)
                 {
                     itemList[i][j].data = idList[i][j];
+                    itemList[i][j].SetPosition((_ui.m_rangeDown.width / 10.0f) * (1 + (j * 2.0f)), (_ui.m_rangeDown.height / 10) * (1 + (i * 2.0f)), 0);
                     if (idList[i][j] == 0)
                     {
                         itemList[i][j].GetChild("icon").icon = "";