Browse Source

合成小游戏提交

zhangyuqian 1 năm trước cách đây
mục cha
commit
12c8011bb3
33 tập tin đã thay đổi với 1577 bổ sung0 xóa
  1. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_Button11.cs
  2. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_Button11.cs.meta
  3. 77 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MaterialItem.cs
  4. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MaterialItem.cs.meta
  5. 83 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameItemUI.cs
  6. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameItemUI.cs.meta
  7. 92 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameRouteTips.cs
  8. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameRouteTips.cs.meta
  9. 120 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameUI.cs
  10. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameUI.cs.meta
  11. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGamematerialItem.cs
  12. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGamematerialItem.cs.meta
  13. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_NewMaterialShowView.cs
  14. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_NewMaterialShowView.cs.meta
  15. 95 0
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameMaterialTipView.cs
  16. 11 0
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameMaterialTipView.cs.meta
  17. 540 0
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameView.cs
  18. 11 0
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameView.cs.meta
  19. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0!a.png
  20. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0.png
  21. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1!a.png
  22. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1.png
  23. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_2!a.png
  24. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_2.png
  25. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_3!a.png
  26. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_3.png
  27. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_4!a.png
  28. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_4.png
  29. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_5!a.png
  30. 120 0
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_5!a.png.meta
  31. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_5.png
  32. 120 0
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_5.png.meta
  33. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_fui.bytes

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_Button11.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_Button11
+    {
+        public GButton target;
+        public GTextField m_sellText;
+        public GLoader m_sellReward;
+        public GTextField m_sellGetNum;
+        public const string URL = "ui://wgkh30qjqbf44c";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "Button11";
+        private static UI_Button11 _proxy;
+
+        public static UI_Button11 Create(GObject gObject = null)
+        {
+            var ui = new UI_Button11();
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_Button11 Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_Button11();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GButton)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_sellText = (GTextField)comp.GetChild("sellText");
+            m_sellReward = (GLoader)comp.GetChild("sellReward");
+            m_sellGetNum = (GTextField)comp.GetChild("sellGetNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_sellText = null;
+            m_sellReward = null;
+            m_sellGetNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_Button11.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c7179409d7ea2d64082fe9e5fb055cce
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 77 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MaterialItem.cs

@@ -0,0 +1,77 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_MaterialItem
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GLoader m_icon;
+        public GTextField m_Count;
+        public const string URL = "ui://wgkh30qjqbf44a";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "MaterialItem";
+        private static UI_MaterialItem _proxy;
+
+        public static UI_MaterialItem Create(GObject gObject = null)
+        {
+            var ui = new UI_MaterialItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_MaterialItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MaterialItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_Count = (GTextField)comp.GetChild("Count");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_icon = null;
+            m_Count = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MaterialItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 81b01777d436eb840a6ba98c59081753
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 83 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameItemUI.cs

@@ -0,0 +1,83 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_MergeGameItemUI
+    {
+        public GComponent target;
+        public GLoader m_icon;
+        public Transition m_t0;
+        public Transition m_t1;
+        public Transition m_t2;
+        public Transition m_t3;
+        public const string URL = "ui://wgkh30qjqbf42w";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "MergeGameItemUI";
+        private static UI_MergeGameItemUI _proxy;
+
+        public static UI_MergeGameItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MergeGameItemUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_MergeGameItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MergeGameItemUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_t0 = comp.GetTransition("t0");
+            m_t1 = comp.GetTransition("t1");
+            m_t2 = comp.GetTransition("t2");
+            m_t3 = comp.GetTransition("t3");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_icon = null;
+            m_t0 = null;
+            m_t1 = null;
+            m_t2 = null;
+            m_t3 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameItemUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0d5a30851ed99a749bc80dabad985a58
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 92 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameRouteTips.cs

@@ -0,0 +1,92 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_MergeGameRouteTips
+    {
+        public GComponent target;
+        public GGraph m_btnBack;
+        public GLoader m_bg;
+        public GLoader m_AFuHead;
+        public GList m_AFuList;
+        public GLoader m_DouBaoHead;
+        public GList m_DouBaoList;
+        public GTextField m_name;
+        public GTextField m_desc;
+        public const string URL = "ui://wgkh30qjqbf42z";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "MergeGameRouteTips";
+        private static UI_MergeGameRouteTips _proxy;
+
+        public static UI_MergeGameRouteTips Create(GObject gObject = null)
+        {
+            var ui = new UI_MergeGameRouteTips();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_MergeGameRouteTips Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MergeGameRouteTips();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_btnBack = (GGraph)comp.GetChild("btnBack");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_AFuHead = (GLoader)comp.GetChild("AFuHead");
+            m_AFuList = (GList)comp.GetChild("AFuList");
+            m_DouBaoHead = (GLoader)comp.GetChild("DouBaoHead");
+            m_DouBaoList = (GList)comp.GetChild("DouBaoList");
+            m_name = (GTextField)comp.GetChild("name");
+            m_desc = (GTextField)comp.GetChild("desc");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_btnBack = null;
+            m_bg = null;
+            m_AFuHead = null;
+            m_AFuList = null;
+            m_DouBaoHead = null;
+            m_DouBaoList = null;
+            m_name = null;
+            m_desc = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameRouteTips.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 63b6cccc73a82eb46b2fef058a088add
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 120 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameUI.cs

@@ -0,0 +1,120 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_MergeGameUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GLoader m_backBtn;
+        public GComponent m_rangeTop;
+        public GComponent m_rangeDown;
+        public GTextField m_name;
+        public GTextField m_desc;
+        public GButton m_MergeTipBtn;
+        public UI_Button11 m_sellBtn;
+        public GLoader m_taskBg;
+        public GTextField m_rewardNum;
+        public UI_MaterialItem m_rewardOne;
+        public UI_MaterialItem m_rewardTwo;
+        public GLoader m_rewardIcon;
+        public GButton m_rewardGet;
+        public GButton m_shopBtn;
+        public UI_NewMaterialShowView m_newMaterial;
+        public const string URL = "ui://wgkh30qjqbf42v";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "MergeGameUI";
+        private static UI_MergeGameUI _proxy;
+
+        public static UI_MergeGameUI Create(GObject gObject = null)
+        {
+            var ui = new UI_MergeGameUI();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_MergeGameUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MergeGameUI();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_backBtn = (GLoader)comp.GetChild("backBtn");
+            m_rangeTop = (GComponent)comp.GetChild("rangeTop");
+            m_rangeDown = (GComponent)comp.GetChild("rangeDown");
+            m_name = (GTextField)comp.GetChild("name");
+            m_desc = (GTextField)comp.GetChild("desc");
+            m_MergeTipBtn = (GButton)comp.GetChild("MergeTipBtn");
+            m_sellBtn = (UI_Button11)UI_Button11.Create(comp.GetChild("sellBtn"));
+            m_taskBg = (GLoader)comp.GetChild("taskBg");
+            m_rewardNum = (GTextField)comp.GetChild("rewardNum");
+            m_rewardOne = (UI_MaterialItem)UI_MaterialItem.Create(comp.GetChild("rewardOne"));
+            m_rewardTwo = (UI_MaterialItem)UI_MaterialItem.Create(comp.GetChild("rewardTwo"));
+            m_rewardIcon = (GLoader)comp.GetChild("rewardIcon");
+            m_rewardGet = (GButton)comp.GetChild("rewardGet");
+            m_shopBtn = (GButton)comp.GetChild("shopBtn");
+            m_newMaterial = (UI_NewMaterialShowView)UI_NewMaterialShowView.Create(comp.GetChild("newMaterial"));
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_backBtn = null;
+            m_rangeTop = null;
+            m_rangeDown = null;
+            m_name = null;
+            m_desc = null;
+            m_MergeTipBtn = null;
+            m_sellBtn.Dispose();
+            m_sellBtn = null;
+            m_taskBg = null;
+            m_rewardNum = null;
+            m_rewardOne.Dispose();
+            m_rewardOne = null;
+            m_rewardTwo.Dispose();
+            m_rewardTwo = null;
+            m_rewardIcon = null;
+            m_rewardGet = null;
+            m_shopBtn = null;
+            m_newMaterial.Dispose();
+            m_newMaterial = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGameUI.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 925f63c211395c04f97f7a3e2aa7499b
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGamematerialItem.cs

@@ -0,0 +1,80 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_MergeGamematerialItem
+    {
+        public GComponent target;
+        public GLoader m_iconBg;
+        public GLoader m_icon;
+        public GLoader m_newIcon;
+        public GLoader m_right;
+        public const string URL = "ui://wgkh30qjqbf430";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "MergeGamematerialItem";
+        private static UI_MergeGamematerialItem _proxy;
+
+        public static UI_MergeGamematerialItem Create(GObject gObject = null)
+        {
+            var ui = new UI_MergeGamematerialItem();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_MergeGamematerialItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_MergeGamematerialItem();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_iconBg = (GLoader)comp.GetChild("iconBg");
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_newIcon = (GLoader)comp.GetChild("newIcon");
+            m_right = (GLoader)comp.GetChild("right");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_iconBg = null;
+            m_icon = null;
+            m_newIcon = null;
+            m_right = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_MergeGamematerialItem.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2ae78b5dcd97acd4eb82c93f3a02b9a6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_NewMaterialShowView.cs

@@ -0,0 +1,74 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_NewMaterialShowView
+    {
+        public GComponent target;
+        public GLoader m_icon;
+        public Transition m_t0;
+        public const string URL = "ui://wgkh30qjqbf44d";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "NewMaterialShowView";
+        private static UI_NewMaterialShowView _proxy;
+
+        public static UI_NewMaterialShowView Create(GObject gObject = null)
+        {
+            var ui = new UI_NewMaterialShowView();
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static UI_NewMaterialShowView Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_NewMaterialShowView();
+            }
+            var ui = _proxy;
+            if(gObject == null)
+            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            else
+            	ui.target =  (GComponent)gObject;
+            ui.Init(ui.target);
+            return ui;
+        }
+
+        public static void ProxyEnd()
+        {
+            if (_proxy != null)
+            {
+                _proxy.Dispose();
+            }
+        }
+
+        public static void ClearProxy()
+        {
+            ProxyEnd();
+            _proxy = null;
+        }
+
+        private void Init(GComponent comp)
+        {
+            m_icon = (GLoader)comp.GetChild("icon");
+            m_t0 = comp.GetTransition("t0");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_icon = null;
+            m_t0 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_NewMaterialShowView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 23f1ab37a9ea7794db0d64706b599677
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 95 - 0
GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameMaterialTipView.cs

@@ -0,0 +1,95 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class MergeGameMaterialTipView : BaseWindow
+    {
+        private UI_MergeGameRouteTips _ui;
+        private int _res;
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MergeGameRouteTips.PACKAGE_NAME;
+            _ui = UI_MergeGameRouteTips.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_btnBack.onClick.Add(Hide);
+
+            _ui.m_AFuList.itemRenderer = RenderAFuList;
+            _ui.m_DouBaoList.itemRenderer = RenderDouBaoList;
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            if (this.viewData != null && (this.viewData as object[]).Length != 2)
+            {
+                _res = (int)(this.viewData as object[])[0];
+            }
+            else
+            {
+                _res = 1;
+            }
+            _ui.m_AFuList.numItems = 10;
+            _ui.m_DouBaoList.numItems = 10;
+
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void RenderAFuList(int index, GObject obj)
+        {
+            UI_MergeGamematerialItem item = UI_MergeGamematerialItem.Proxy(obj);
+            item.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res,index+11)[0].resName,"MergeGame");
+            if( (index+1) % 5 == 0)
+            {
+                item.m_right.visible = false;
+            }
+            if(item.target.data == null)
+            {
+                item.target.onClick.Add(OnClickItem);
+            }
+            item.target.data = index + 1;
+            UI_MergeGamematerialItem.ProxyEnd();
+        }
+        private void RenderDouBaoList(int index,GObject obj)
+        {
+            UI_MergeGamematerialItem item = UI_MergeGamematerialItem.Proxy(obj);
+            item.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, index+1)[0].resName, "MergeGame");
+            if ((index + 1) % 5 == 0)
+            {
+                item.m_right.visible = false;
+            }
+            if (item.target.data == null)
+            {
+                item.target.onClick.Add(OnClickItem);
+            }
+            item.target.data = index + 1 + 10;
+            UI_MergeGamematerialItem.ProxyEnd();
+        }
+        private void OnClickItem(EventContext context)
+        {
+            int index = (int)(context.sender as GObject).data;
+            _ui.m_name.text = index.ToString();
+            _ui.m_desc.text = index.ToString();
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameMaterialTipView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 99104a61ee84eb941abd1a1310e27d83
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 540 - 0
GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameView.cs

@@ -0,0 +1,540 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class MergeGameView : BaseWindow
+    {
+        private UI_MergeGameUI _ui;
+
+        private List<List<GComponent>> itemList = new List<List<GComponent>>();
+        private List<List<int>> idList = new List<List<int>>();
+        private int itemNum;
+        private int maxLv;
+        private System.Random rand;
+        private int _gameID;
+        private int _res;
+
+        //当前拖拽的index;
+        private int indexID;
+        //开始拖拽的坐标
+        private float startX;
+        private float startY;
+        private int indexX;
+        private int indexY;
+
+        //当前任务id;后台获取数据
+        private int taskId;
+        //当前点击id信息
+        private int materialID;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_MergeGameUI.PACKAGE_NAME;
+            _ui = UI_MergeGameUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_backBtn.onClick.Add(Hide);
+            _ui.m_rewardGet.onClick.Add(SubmitTask);
+            _ui.m_MergeTipBtn.onClick.Add(ShowMergeRouteTips);
+            _ui.m_shopBtn.onClick.Add(ShowShopBtn);
+            _ui.m_sellBtn.target.onClick.Add(OnClickSellBtn);
+            _ui.target.onClick.Add(OnClickHideTips);
+
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            //进入这个界面的时候向后台获取任务id和历史id列表
+            UpdateView();
+            UpdateList();
+            UpdateTask();
+        }
+        protected override void OnHide()
+        {
+            for (int i = 0; i < itemNum; i++)
+            {
+                for (int j = 0; j < itemNum; j++)
+                {
+                    itemList[i][j].Dispose();
+                    itemList[i][j] = null;
+                }
+            }
+            idList.Clear();
+            itemList.Clear();
+            base.OnHide();
+        }
+        private void UpdateView()
+        {
+            itemNum = 5;
+            taskId = MiniGameDateManager.Instance.taskID;
+            _res = MergeGameArray.Instance.GetCfg(taskId).resArr[0];
+            maxLv = 5;
+            materialID = 0;
+            rand = new System.Random();
+            _ui.m_rewardGet.visible = false;
+            _ui.m_sellBtn.target.GetChild("sellGetNum").text = "";
+            //_ui.m_newMaterial.target.visible = false;
+            _ui.m_name.text = "";
+            _ui.m_desc.text = ""; 
+            _ui.m_bg.url = ResPathUtil.GetBgImgPath("jbnf_xyxbj");
+        }
+        private void UpdateList()
+        {
+            for (int i = 0; i < itemNum; i++)
+            {
+                itemList.Add(new List<GComponent>());
+                idList.Add(new List<int>());
+                for (int j = 0; j < itemNum; j++)
+                {
+                    idList[i].Add(j);
+                    itemList[i].Add(UIPackage.CreateObject(UI_MergeGameUI.PACKAGE_NAME, "MergeGameItemUI").asCom);
+                    _ui.m_rangeDown.AddChild(itemList[i][j]);
+                    //对两个按钮单独处理
+                    if (i == itemNum - 1)
+                    {
+                        itemList[i][j].data = -1;
+                        idList[i][j] = -1;
+                        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 (j == 0)
+                        {
+                            itemList[i][j].GetChild("icon").icon = "ui://MiniGame/jbnf_doubao_icon";
+                            itemList[i][j].onClick.Add(OnClickAFuBtn);
+                            continue;
+                        }
+                        if ( j == itemNum - 1)
+                        {
+                            itemList[i][j].GetChild("icon").icon = "ui://MiniGame/jbnf_afu_icon";
+                            itemList[i][j].onClick.Add(OnClickDouBaoBtn);
+                            continue;
+                        }
+                    }
+                    //表示id;这里后续要改
+                    idList[i][j] = 0;
+                    if (i == 1 && j == 2)
+                    {
+                        idList[i][j] = 1;
+                    }
+                    if(i== 2 && j== 2)
+                    {
+                        idList[i][j] = 1;
+                    }
+                    //
+                    itemList[i][j].data = idList[i][j];
+                    itemList[i][j].draggable = true;
+                    itemList[i][j].onDragStart.Add(onDragStart);
+                    itemList[i][j].onDragEnd.Add(onDragEnd);
+                    itemList[i][j].onClick.Add(OnClickItem);
+                    itemList[i][j].dragBounds = new Rect(_ui.m_rangeTop.x + 90, _ui.m_rangeTop.y + 90, _ui.m_rangeTop.width, _ui.m_rangeTop.height);
+                    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 = "";
+                        itemList[i][j].draggable = false;
+                    }
+                    else
+                    {
+                        itemList[i][j].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, idList[i][j])[0].resName, "MergeGame");
+                    }
+                }
+            }
+        }
+        private void onDragStart(EventContext context)
+        {
+            GObject item = context.sender as GObject;
+            int itemInfo = (int)(context.sender as GObject).data;
+            indexY = Math.Min(itemNum - 1, (int)(item.x / (_ui.m_rangeDown.width / 5)));
+            indexX = Math.Min(itemNum - 1, (int)(item.y / (_ui.m_rangeDown.height / 5)));
+            startX = item.x;
+            startY = item.y;
+            indexID = itemInfo;
+            _ui.m_rangeDown.RemoveChild(item);
+            _ui.m_rangeTop.AddChild(item);
+        }
+        private void onDragEnd(EventContext context)
+        {
+            GObject item = context.sender as GObject;
+
+            int endIndexY = Math.Min(itemNum - 1 , (int)(item.x / (_ui.m_rangeDown.width/5)));
+            int endIndexX = Math.Min(itemNum - 1 ,(int)(item.y / (_ui.m_rangeDown.height/5)));
+            int itemEndInfo = (int)itemList[endIndexX][endIndexY].data;
+ 
+            //合成规则:相同合成,但是材料只有五级,5和5不能合成6, 6属于另一类材料的一级
+            if (itemEndInfo == indexID && (indexX != endIndexX || indexY != endIndexY) && (itemEndInfo % maxLv != 0))
+            {
+                indexID = 0;
+                idList[indexX][indexY] = 0;
+                itemList[indexX][indexY].data = 0;
+                itemList[indexX][indexY].GetChild("icon").icon = "";
+                idList[endIndexX][endIndexY] = itemEndInfo + 1;
+                itemList[endIndexX][endIndexY].data = itemEndInfo + 1;
+                itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, itemEndInfo + 1)[0].resName, "MergeGame");
+                ShowNewMaterialView(endIndexX, endIndexY);
+                 UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[endIndexX][endIndexY]);
+                itemUI.m_t0.Play();
+                UI_MergeGameItemUI.ProxyEnd();
+
+                if(InspectionTasks())
+                {
+                    _ui.m_rewardGet.visible = true;
+                }
+                else
+                {
+                    _ui.m_rewardGet.visible = false;
+                }
+            }
+            if (itemEndInfo != indexID && itemEndInfo == 0)
+            {
+                idList[indexX][indexY] = 0;
+                itemList[indexX][indexY].data = 0;
+                itemList[indexX][indexY].GetChild("icon").icon = "";
+                idList[endIndexX][endIndexY] = indexID;
+                itemList[endIndexX][endIndexY].data = indexID;
+                itemList[endIndexX][endIndexY].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, indexID)[0].resName, "MergeGame");
+
+                itemEndInfo = indexID;
+                indexID = 0;
+            }
+
+            item.x = startX;
+            item.y = startY;
+
+            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)
+        {
+            GObject item = context.sender as GObject;
+            int id = (int)item.data;
+            if(id <= 0)
+            {
+                return;
+            }
+            indexY = Math.Min(itemNum - 1, (int)(item.x / (_ui.m_rangeDown.width / 5)));
+            indexX = Math.Min(itemNum - 1, (int)(item.y / (_ui.m_rangeDown.height / 5)));
+            materialID = id;
+            _ui.m_name.text = id.ToString();
+            _ui.m_desc.text = id.ToString();
+            ItemCfg itemReward = ItemCfgArray.Instance.GetCfg(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, id)[0].bonusSellArr[0][0]);
+            _ui.m_sellBtn.target.GetChild("sellReward").icon = ResPathUtil.GetCommonGameResPath(itemReward.res);
+            _ui.m_sellBtn.target.GetChild("sellGetNum").text = MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, id)[0].bonusSellArr[0][1].ToString();
+
+        }
+
+        private void OnClickSellBtn()
+        {
+            if(materialID == 0)
+            {
+                return;
+            }
+            //移除
+            _ui.m_name.text = "";
+            _ui.m_desc.text = "";
+            _ui.m_sellBtn.target.GetChild("sellReward").icon = "";
+            _ui.m_sellBtn.target.GetChild("sellGetNum").text = "";
+            materialID = 0;
+            idList[indexX][indexY] = 0;
+            itemList[indexX][indexY].data = 0;
+            UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[indexX][indexY]);
+            itemUI.m_t2.Play();
+            itemUI.m_t3.Play();
+            UI_MergeGameItemUI.ProxyEnd();
+            indexX = 0;
+            indexY = 0;
+            //获得奖励
+        }
+        private void OnClickAFuBtn()
+        {
+            bool gameOver = false;
+            bool isRand = false;
+            int materialID = 0;
+            for (int i = 0; i < itemNum; i++)
+            {
+                for (int j = 0; j < itemNum; j++)
+                {
+                    if (idList[i][j] == 0)
+                    {
+                        gameOver = true;
+                        break;
+                    }
+                }
+            }
+            if (!gameOver)
+            {
+                return;
+            }
+            if(MergeGameArray.Instance.GetCfg(taskId).materialId1Arr.Length > 1)
+            {
+                isRand = true;
+            }
+            else
+            {
+                isRand = false;
+                materialID = MergeGameArray.Instance.GetCfg(taskId).materialId1Arr[0];
+            }
+            while (true)
+            {
+                int x = rand.Next(0, itemNum);
+                int y = rand.Next(0, itemNum);
+                int num;
+                int randNum = rand.Next(0, 2);
+                if (randNum == 0)
+                {
+                    num = 1;
+                }
+                else
+                {
+                    num = 6;
+                }
+                if(!isRand)
+                { 
+                   num = materialID;
+                }
+                if (idList[x][y] == 0)
+                {
+                    idList[x][y] = num;
+                    itemList[x][y].data = num;
+                    itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, num)[0].resName, "MergeGame");
+                    itemList[x][y].draggable = true;
+                    UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[x][y]);
+                    itemUI.m_t1.Play();
+                    UI_MergeGameItemUI.ProxyEnd();
+                    break;
+                }
+            }
+        }
+        private void OnClickDouBaoBtn()
+        {
+            bool gameOver = false;
+            bool isRand = false;
+            int materialID = 0;
+            for (int i = 0; i < itemNum; i++)
+            {
+                for (int j = 0; j < itemNum; j++)
+                {
+                    if (idList[i][j] == 0)
+                    {
+                        gameOver = true;
+                        break;
+                    }
+                }
+            }
+            if (!gameOver)
+            {
+                return;
+            }
+            if (MergeGameArray.Instance.GetCfg(taskId).materialId2Arr.Length > 1)
+            {
+                isRand = true;
+            }
+            else
+            {
+                isRand = false;
+                materialID = MergeGameArray.Instance.GetCfg(taskId).materialId2Arr[0];
+            }
+            while (true)
+            {
+                int x = rand.Next(0, itemNum);
+                int y = rand.Next(0, itemNum);
+                int num;
+                int randNum = rand.Next(0, 2);
+                if (randNum == 0)
+                {
+                    num = 11;
+                }
+                else
+                {
+                    num = 16;
+                }
+                if (!isRand)
+                {
+                    num = materialID;
+                }
+                if (idList[x][y] == 0)
+                {
+                    idList[x][y] = num;
+                    itemList[x][y].data = num;
+                    itemList[x][y].draggable = true;
+                    itemList[x][y].GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, num)[0].resName, "MergeGame");
+                    UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[x][y]);
+                    itemUI.m_t1.Play();
+                    UI_MergeGameItemUI.ProxyEnd();
+                    break;
+                }
+            }
+        }
+
+        private void UpdateTask()
+        {
+            _ui.m_rewardNum.text = String.Format("+{0}", MergeGameArray.Instance.GetCfg(taskId).bonusWinArr[0][1]);
+            ItemCfg itemReward = ItemCfgArray.Instance.GetCfg(MergeGameArray.Instance.GetCfg(taskId).bonusWinArr[0][0]);
+            _ui.m_rewardIcon.url = ResPathUtil.GetCommonGameResPath(itemReward.res);
+            for (int k = 0; k < MergeGameArray.Instance.GetCfg(taskId).targetIdArr.Length; k++)
+            {
+                int targetID = MergeGameArray.Instance.GetCfg(taskId).targetIdArr[k][0];
+                int targetNum = MergeGameArray.Instance.GetCfg(taskId).targetIdArr[k][1];
+                switch (k)
+                {
+                    case 0:
+                        _ui.m_rewardOne.target.visible = true;
+                        _ui.m_rewardTwo.target.visible = false;
+                        _ui.m_rewardOne.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, targetID)[0].resName, "MergeGame");
+                        _ui.m_rewardOne.m_Count.text = targetNum.ToString();
+                        break;
+                    case 1:
+                        _ui.m_rewardTwo.target.visible = true;
+                        _ui.m_rewardTwo.m_icon.url = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, targetID)[0].resName, "MergeGame");
+                        _ui.m_rewardTwo.m_Count.text = targetNum.ToString();
+                        break;
+                    default:
+                        break;
+                }
+            }
+            if (InspectionTasks())
+            {
+                _ui.m_rewardGet.visible = true;
+            }
+            else
+            {
+                _ui.m_rewardGet.visible = false;
+            }
+        }
+        //提交任务
+        private void SubmitTask()
+        {
+            for(int k =  0;k< MergeGameArray.Instance.GetCfg(taskId).targetIdArr.Length; k++)
+            {
+                int targetID = MergeGameArray.Instance.GetCfg(taskId).targetIdArr[k][0];
+                int targetNum = MergeGameArray.Instance.GetCfg(taskId).targetIdArr[k][1];
+                for (int i = 0; i < itemNum; i++)
+                {
+                    for (int j = 0; j < itemNum; j++)
+                    {
+                        if(idList[i][j] == targetID)
+                        {
+                            idList[i][j] = 0;
+                            itemList[i][j].data = 0;
+                            UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(itemList[i][j]);
+                            itemUI.m_t2.Play();
+                            itemUI.m_t3.Play();
+                            UI_MergeGameItemUI.ProxyEnd();
+                            targetNum--;
+                            if(targetNum == 0)
+                            {
+                                break;
+                            }
+                        }
+                    }
+                    if (targetNum == 0)
+                    {
+                        break;
+                    }
+                }
+            }
+            //向后台发送任务ID,获得奖励
+            //taskId = MiniGameDateManager.Instance.taskID;
+            //暂用
+            taskId++;
+            //
+            UpdateTask();
+        }
+        //检查是否达到提交要求
+        private bool InspectionTasks()
+        {
+            bool isTarged = true;
+            for (int k = 0; k < MergeGameArray.Instance.GetCfg(taskId).targetIdArr.Length; k++)
+            {
+                int targetID = MergeGameArray.Instance.GetCfg(taskId).targetIdArr[k][0];
+                int targetNum = MergeGameArray.Instance.GetCfg(taskId).targetIdArr[k][1];
+                int currentNum = 0;
+                for (int i = 0; i < itemNum; i++)
+                {
+                    for (int j = 0; j < itemNum; j++)
+                    {
+                        if (idList[i][j] == targetID)
+                        {
+                            currentNum++;
+                            if (currentNum == targetNum)
+                            {
+                                break;
+                            }
+                        }
+                    }
+                    if (currentNum == targetNum)
+                    {
+                        break;
+                    }
+                }
+                if (currentNum == targetNum && isTarged)
+                {
+                    isTarged = true;
+                }
+                else
+                {
+                    isTarged = false;
+                }
+            }
+            return isTarged;
+        }
+        private void ShowNewMaterialView(int i ,int j)
+        {
+            //判断是否是新材料。再显示
+
+            _ui.m_newMaterial.target.x = itemList[i][j].x + _ui.m_rangeDown.x;
+            _ui.m_newMaterial.target.y = itemList[i][j].y + _ui.m_rangeDown.y;
+            _ui.m_newMaterial.target.visible = true;
+            _ui.m_newMaterial.target.GetChild("icon").icon = ResPathUtil.GetMiniGamePicPath(MergeCfgArray.Instance.GetCfgsByidAndmaterialId(_res, idList[i][j])[0].resName,"MergeGame");
+            UI_MergeGameItemUI itemUI = UI_MergeGameItemUI.Proxy(_ui.m_newMaterial.target);
+            itemUI.m_t0.Play();
+            UI_MergeGameItemUI.ProxyEnd();
+           
+        }
+        private void OnClickHideTips()
+        {
+            if(_ui.m_newMaterial.target.visible == true)
+            {
+                _ui.m_newMaterial.target.visible = false;
+            } 
+        }
+        private void ShowMergeRouteTips()
+        {
+            ViewManager.Show<MergeGameMaterialTipView>(new object[]{ _res });   
+        }
+        private void ShowShopBtn()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/HotUpdate/Views/MiniGame/MergeGameView.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3b6bbad119bd46943a4195011f7dabf4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0!a.png


BIN
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0.png


BIN
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1!a.png


BIN
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1.png


BIN
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_2!a.png


BIN
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_2.png


BIN
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_3!a.png


BIN
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_3.png


BIN
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_4!a.png


BIN
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_4.png


BIN
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_5!a.png


+ 120 - 0
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_5!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: db8d5e7952e4319478a695444b4e22b4
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/MiniGame/MiniGame_atlas0_5.png


+ 120 - 0
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_5.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: c06bfdf0b960aa8478c75e1044683195
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: 50
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    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/MiniGame/MiniGame_fui.bytes