Browse Source

小游戏补充提交

zhangyuqian 1 year ago
parent
commit
30d5f1955e
35 changed files with 1288 additions and 49 deletions
  1. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ChallengeRewardItemUI.cs
  2. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ChallengeRewardItemUI.cs.meta
  3. 80 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ChallengeRewardsUI.cs
  4. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ChallengeRewardsUI.cs.meta
  5. 3 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_FlipGameUI.cs
  6. 113 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_GameStartUI.cs
  7. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_GameStartUI.cs.meta
  8. 104 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ResultTipsUI.cs
  9. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ResultTipsUI.cs.meta
  10. 71 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_SyntheticRouteTipUI.cs
  11. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_SyntheticRouteTipUI.cs.meta
  12. 12 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_TZFEGameView.cs
  13. 0 3
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_numItem.cs
  14. 74 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_rewardItem.cs
  15. 11 0
      GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_rewardItem.cs.meta
  16. 66 0
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/ChallengeRewardView.cs
  17. 11 0
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/ChallengeRewardView.cs.meta
  18. 20 26
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/FlipGameView.cs
  19. 94 0
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/GameStartView.cs
  20. 11 0
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/GameStartView.cs.meta
  21. 129 0
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/ResultTipsView.cs
  22. 11 0
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/ResultTipsView.cs.meta
  23. 42 0
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/SyntheticRoutetipView.cs
  24. 11 0
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/SyntheticRoutetipView.cs.meta
  25. 101 14
      GameClient/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameVIew.cs
  26. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0.png
  27. 1 1
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0.png.meta
  28. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1.png
  29. 1 1
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1.png.meta
  30. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_2.png
  31. 96 0
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_2.png.meta
  32. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_3.png
  33. 96 0
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_3.png.meta
  34. BIN
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_fui.bytes
  35. 1 1
      GameClient/Assets/ResIn/UI/MiniGame/MiniGame_fui.bytes.meta

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ChallengeRewardItemUI.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_ChallengeRewardItemUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GTextField m_rewardDesc;
+        public const string URL = "ui://wgkh30qjlw8c24";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "ChallengeRewardItemUI";
+        private static UI_ChallengeRewardItemUI _proxy;
+
+        public static UI_ChallengeRewardItemUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ChallengeRewardItemUI();
+            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_ChallengeRewardItemUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ChallengeRewardItemUI();
+            }
+            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_rewardDesc = (GTextField)comp.GetChild("rewardDesc");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_rewardDesc = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 80 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ChallengeRewardsUI.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_ChallengeRewardsUI
+    {
+        public GComponent target;
+        public GLoader m_exit;
+        public GLoader m_bg;
+        public GList m_rewardOneList;
+        public GList m_rewardTwoList;
+        public const string URL = "ui://wgkh30qjlw8c23";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "ChallengeRewardsUI";
+        private static UI_ChallengeRewardsUI _proxy;
+
+        public static UI_ChallengeRewardsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ChallengeRewardsUI();
+            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_ChallengeRewardsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ChallengeRewardsUI();
+            }
+            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_exit = (GLoader)comp.GetChild("exit");
+            m_bg = (GLoader)comp.GetChild("bg");
+            m_rewardOneList = (GList)comp.GetChild("rewardOneList");
+            m_rewardTwoList = (GList)comp.GetChild("rewardTwoList");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_exit = null;
+            m_bg = null;
+            m_rewardOneList = null;
+            m_rewardTwoList = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 3 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_FlipGameUI.cs

@@ -10,8 +10,8 @@ namespace UI.MiniGame
         public GLoader m_loaBg;
         public GList m_cardList;
         public GLoader m_back;
-        public GTextField m_timeText;
         public GProgressBar m_ScareBar;
+        public GTextField m_timeText;
         public GImage m_star11;
         public GGroup m_star1;
         public GImage m_star21;
@@ -71,8 +71,8 @@ namespace UI.MiniGame
             m_loaBg = (GLoader)comp.GetChild("loaBg");
             m_cardList = (GList)comp.GetChild("cardList");
             m_back = (GLoader)comp.GetChild("back");
-            m_timeText = (GTextField)comp.GetChild("timeText");
             m_ScareBar = (GProgressBar)comp.GetChild("ScareBar");
+            m_timeText = (GTextField)comp.GetChild("timeText");
             m_star11 = (GImage)comp.GetChild("star11");
             m_star1 = (GGroup)comp.GetChild("star1");
             m_star21 = (GImage)comp.GetChild("star21");
@@ -88,8 +88,8 @@ namespace UI.MiniGame
             m_loaBg = null;
             m_cardList = null;
             m_back = null;
-            m_timeText = null;
             m_ScareBar = null;
+            m_timeText = null;
             m_star11 = null;
             m_star1 = null;
             m_star21 = null;

+ 113 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_GameStartUI.cs

@@ -0,0 +1,113 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_GameStartUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GLoader m_btnBack;
+        public GLoader m_rewardBtn;
+        public GLoader m_shopBtn;
+        public GLoader m_ticket;
+        public GLoader m_addIcon;
+        public GTextField m_ticketNum;
+        public GLoader m_game1;
+        public GTextField m_game1name;
+        public GLoader m_needIcon1;
+        public GTextField m_needNum1;
+        public GLoader m_game2;
+        public GTextField m_game2name;
+        public GLoader m_needIcon2;
+        public GTextField m_needNum2;
+        public const string URL = "ui://wgkh30qjlw8c21";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "GameStartUI";
+        private static UI_GameStartUI _proxy;
+
+        public static UI_GameStartUI Create(GObject gObject = null)
+        {
+            var ui = new UI_GameStartUI();
+            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_GameStartUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_GameStartUI();
+            }
+            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_btnBack = (GLoader)comp.GetChild("btnBack");
+            m_rewardBtn = (GLoader)comp.GetChild("rewardBtn");
+            m_shopBtn = (GLoader)comp.GetChild("shopBtn");
+            m_ticket = (GLoader)comp.GetChild("ticket");
+            m_addIcon = (GLoader)comp.GetChild("addIcon");
+            m_ticketNum = (GTextField)comp.GetChild("ticketNum");
+            m_game1 = (GLoader)comp.GetChild("game1");
+            m_game1name = (GTextField)comp.GetChild("game1name");
+            m_needIcon1 = (GLoader)comp.GetChild("needIcon1");
+            m_needNum1 = (GTextField)comp.GetChild("needNum1");
+            m_game2 = (GLoader)comp.GetChild("game2");
+            m_game2name = (GTextField)comp.GetChild("game2name");
+            m_needIcon2 = (GLoader)comp.GetChild("needIcon2");
+            m_needNum2 = (GTextField)comp.GetChild("needNum2");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_btnBack = null;
+            m_rewardBtn = null;
+            m_shopBtn = null;
+            m_ticket = null;
+            m_addIcon = null;
+            m_ticketNum = null;
+            m_game1 = null;
+            m_game1name = null;
+            m_needIcon1 = null;
+            m_needNum1 = null;
+            m_game2 = null;
+            m_game2name = null;
+            m_needIcon2 = null;
+            m_needNum2 = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 104 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_ResultTipsUI.cs

@@ -0,0 +1,104 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_ResultTipsUI
+    {
+        public GComponent target;
+        public GLoader m_resultTitle;
+        public GTextField m_failTxt;
+        public GLoader m_star1;
+        public GLoader m_star2;
+        public GLoader m_star3;
+        public GGroup m_success;
+        public GTextField m_resultTxt;
+        public GList m_rewardList;
+        public GLoader m_againBtn;
+        public GLoader m_exitBtn;
+        public GLoader m_consumeIcon;
+        public GTextField m_consumeTxt;
+        public const string URL = "ui://wgkh30qjlw8c1w";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "ResultTipsUI";
+        private static UI_ResultTipsUI _proxy;
+
+        public static UI_ResultTipsUI Create(GObject gObject = null)
+        {
+            var ui = new UI_ResultTipsUI();
+            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_ResultTipsUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_ResultTipsUI();
+            }
+            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_resultTitle = (GLoader)comp.GetChild("resultTitle");
+            m_failTxt = (GTextField)comp.GetChild("failTxt");
+            m_star1 = (GLoader)comp.GetChild("star1");
+            m_star2 = (GLoader)comp.GetChild("star2");
+            m_star3 = (GLoader)comp.GetChild("star3");
+            m_success = (GGroup)comp.GetChild("success");
+            m_resultTxt = (GTextField)comp.GetChild("resultTxt");
+            m_rewardList = (GList)comp.GetChild("rewardList");
+            m_againBtn = (GLoader)comp.GetChild("againBtn");
+            m_exitBtn = (GLoader)comp.GetChild("exitBtn");
+            m_consumeIcon = (GLoader)comp.GetChild("consumeIcon");
+            m_consumeTxt = (GTextField)comp.GetChild("consumeTxt");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_resultTitle = null;
+            m_failTxt = null;
+            m_star1 = null;
+            m_star2 = null;
+            m_star3 = null;
+            m_success = null;
+            m_resultTxt = null;
+            m_rewardList = null;
+            m_againBtn = null;
+            m_exitBtn = null;
+            m_consumeIcon = null;
+            m_consumeTxt = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 71 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_SyntheticRouteTipUI.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.MiniGame
+{
+    public partial class UI_SyntheticRouteTipUI
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public const string URL = "ui://wgkh30qjlw8c1n";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "SyntheticRouteTipUI";
+        private static UI_SyntheticRouteTipUI _proxy;
+
+        public static UI_SyntheticRouteTipUI Create(GObject gObject = null)
+        {
+            var ui = new UI_SyntheticRouteTipUI();
+            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_SyntheticRouteTipUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_SyntheticRouteTipUI();
+            }
+            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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 12 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_TZFEGameView.cs

@@ -11,6 +11,10 @@ namespace UI.MiniGame
         public GList m_numList;
         public GLoader m_backBtn;
         public GTextField m_score;
+        public GLoader m_target;
+        public GTextField m_time;
+        public GTextField m_timeNum;
+        public GLoader m_mergeBtn;
         public const string URL = "ui://wgkh30qjjmg19";
         public const string PACKAGE_NAME = "MiniGame";
         public const string RES_NAME = "TZFEGameView";
@@ -62,6 +66,10 @@ namespace UI.MiniGame
             m_numList = (GList)comp.GetChild("numList");
             m_backBtn = (GLoader)comp.GetChild("backBtn");
             m_score = (GTextField)comp.GetChild("score");
+            m_target = (GLoader)comp.GetChild("target");
+            m_time = (GTextField)comp.GetChild("time");
+            m_timeNum = (GTextField)comp.GetChild("timeNum");
+            m_mergeBtn = (GLoader)comp.GetChild("mergeBtn");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -69,6 +77,10 @@ namespace UI.MiniGame
             m_numList = null;
             m_backBtn = null;
             m_score = null;
+            m_target = null;
+            m_time = null;
+            m_timeNum = null;
+            m_mergeBtn = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

+ 0 - 3
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_numItem.cs

@@ -8,7 +8,6 @@ namespace UI.MiniGame
     {
         public GComponent target;
         public GLoader m_icon;
-        public GTextField m_numTxt;
         public Transition m_t0;
         public Transition m_t1;
         public const string URL = "ui://wgkh30qjjmg1a";
@@ -59,14 +58,12 @@ namespace UI.MiniGame
         private void Init(GComponent comp)
         {
             m_icon = (GLoader)comp.GetChild("icon");
-            m_numTxt = (GTextField)comp.GetChild("numTxt");
             m_t0 = comp.GetTransition("t0");
             m_t1 = comp.GetTransition("t1");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_icon = null;
-            m_numTxt = null;
             m_t0 = null;
             m_t1 = null;
             if(disposeTarget && target != null)

+ 74 - 0
GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/MiniGame/UI_rewardItem.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_rewardItem
+    {
+        public GComponent target;
+        public GLoader m_bg;
+        public GLoader m_icon;
+        public const string URL = "ui://wgkh30qjlw8c1z";
+        public const string PACKAGE_NAME = "MiniGame";
+        public const string RES_NAME = "rewardItem";
+        private static UI_rewardItem _proxy;
+
+        public static UI_rewardItem Create(GObject gObject = null)
+        {
+            var ui = new UI_rewardItem();
+            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_rewardItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_rewardItem();
+            }
+            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");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_icon = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

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

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

+ 66 - 0
GameClient/Assets/Game/HotUpdate/Views/MiniGame/ChallengeRewardView.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ChallengeRewardView : BaseView
+    {
+        private UI_ChallengeRewardsUI _ui;
+
+        private List<int> gameList = new List<int>();
+        private Dictionary<int, string> gameDic = new Dictionary<int, string>() { { 0,"翻牌"},{ 1,"2048"} };
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ChallengeRewardsUI.PACKAGE_NAME;
+            _ui = UI_ChallengeRewardsUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_exit.onClick.Add(Hide);
+            _ui.m_rewardOneList.itemRenderer = RenderListOne;
+            _ui.m_rewardTwoList.itemRenderer = RenderListTwo;
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            gameList = (this.viewData as object[])[0] as List<int>;
+            _ui.m_rewardOneList.numItems = 3;
+            _ui.m_rewardTwoList.numItems = 3;
+
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void RenderListOne(int index ,GObject obj)
+        {
+            UI_ChallengeRewardItemUI item = UI_ChallengeRewardItemUI.Proxy(obj);
+            int starNum = 3 - index;
+            item.m_rewardDesc.text = string.Format("{0}游戏首次{1}星通关",gameDic[0], starNum);
+            UI_ChallengeRewardItemUI.ProxyEnd();
+        }
+        private void RenderListTwo(int index, GObject obj)
+        {
+            UI_ChallengeRewardItemUI item = UI_ChallengeRewardItemUI.Proxy(obj);
+            int starNum = 3 - index;
+            item.m_rewardDesc.text = string.Format("{0}游戏首次{1}星通关", gameDic[1], starNum);
+            UI_ChallengeRewardItemUI.ProxyEnd();
+        }
+    }
+}

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

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

+ 20 - 26
GameClient/Assets/Game/HotUpdate/Views/MiniGame/FlipGameView.cs

@@ -23,6 +23,8 @@ namespace GFGGame
         private int gameTime = 120;
         //游戏当前时长
         private int currentGameTime = 120;
+        //进度条
+        private float barTime = 120.0f;
         //行数
         private int rows = 0;
         //列数
@@ -85,15 +87,18 @@ namespace GFGGame
             Timers.inst.Remove(UpdateTime);
             Timers.inst.Remove(canTouch);
             Timers.inst.Remove(UpdateCard);
+            Timers.inst.Remove(UpdateBar);
         }
 
         private void OnClickBtnBack()
         {
             Timers.inst.Remove(UpdateTime);
+            Timers.inst.Remove(UpdateBar);
             AlertUI.Show("是否退出游戏")
             .SetLeftButton(true, "取消", (object data) =>
             {
                 Timers.inst.Add(1.0f, 0, UpdateTime);
+                Timers.inst.Add(0.1f, 0, UpdateBar);
             })
             .SetRightButton(true, "确定", (object data) =>
             {
@@ -127,12 +132,13 @@ namespace GFGGame
         {
             currentGameTime = gameTime;
             currentCardNum = cardNum;
+            barTime = (float)gameTime;
             needNum = 2;
             rand = new System.Random();
             //洗牌
             RandomCardList(cardArray, cardArray.Length);
             //
-            _ui.m_timeText.text = string.Format("倒计时:{0}", currentGameTime);
+            _ui.m_timeText.text = string.Format("{0}", currentGameTime);
             _ui.m_ScareBar.max = gameTime;
             _ui.m_ScareBar.min = 0;
             _ui.m_ScareBar.value = gameTime;
@@ -142,6 +148,8 @@ namespace GFGGame
  
             //计时器
             Timers.inst.Add(1.0f, 0, UpdateTime);
+            //进度条计时器
+            Timers.inst.Add(0.1f, 0, UpdateBar);
         }
 
         private void UpdateList()
@@ -250,14 +258,18 @@ namespace GFGGame
         private void UpdateTime(object param = null)
         {
             currentGameTime--;
-            _ui.m_ScareBar.value = currentGameTime;
-            _ui.m_timeText.text = string.Format ("倒计时:{0}", currentGameTime);
+            //_ui.m_ScareBar.value = currentGameTime;
+            _ui.m_timeText.text = string.Format ("{0}", currentGameTime);
             if(currentGameTime <= 0)
             {
-                Timers.inst.Remove(UpdateTime);
                 Gameover(false);
             }
         }
+        private void UpdateBar(object param = null)
+        {
+            barTime -= 0.1f;
+            _ui.m_ScareBar.value = barTime;
+        }
 
         private void canTouch(object param = null)
         {
@@ -267,32 +279,14 @@ namespace GFGGame
         private void Gameover(bool isPass = false)
         {
             Timers.inst.Remove(UpdateTime);
-            if (!isPass)
+            Timers.inst.Remove(UpdateBar);
+            if (isPass)
             {
-                AlertUI.Show("游戏时间到")
-                .SetLeftButton(false)
-                .SetRightButton(true, "确定", (object data) =>
-                {
-                    this.Hide();
-                });
+                ViewManager.Show<ResultTipsView>(new object[] { isPass, typeof(FlipGameView).FullName, currentGameTime });
             }
             else
             {
-                string custemsName = "";
-                for(int i = CustemsNum.Count - 1; i>=0; i--)
-                {
-                    if(currentGameTime >= CustemsNum[i])
-                    {
-                        custemsName = CustemsName[i];
-                        break;
-                    }
-                }
-                AlertUI.Show(string.Format("恭喜通过,所用时长:{0},通关评价:{1}", currentGameTime, custemsName))
-                .SetLeftButton(false)
-                .SetRightButton(true, "确定", (object data) =>
-                {
-                    this.Hide();
-                });
+                ViewManager.Show<ResultTipsView>(new object[] { isPass, typeof(FlipGameView).FullName });
             }
         }
         //洗牌

+ 94 - 0
GameClient/Assets/Game/HotUpdate/Views/MiniGame/GameStartView.cs

@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class GameStartView : BaseView
+    {
+        private UI_GameStartUI _ui;
+        //后续这里改成读表内容
+        private List<string> name = new List<string>() { "翻牌", "2048" };
+        private List<string> viewName = new List<string>() { "FlipGameView", "TZFEGameView" };
+        private List<string> CustemsDesc = new List<string>()
+        {
+            "首次评价达到卓越奖励:",
+            "首次评价达到优秀奖励:",
+            "首次评价达到良好奖励:",
+        };
+
+        private int currentGame = 0;
+
+        public override void Dispose()
+        {
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_GameStartUI.PACKAGE_NAME;
+            _ui = UI_GameStartUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_game1.onClick.Add(OnClickBtnGameOne);
+            _ui.m_game2.onClick.Add(OnClickBtnGameTwo);
+            _ui.m_btnBack.onClick.Add(OnClickBtnBack);
+            _ui.m_shopBtn.onClick.Add(OnClickBtnShop);
+            _ui.m_addIcon.onClick.Add(OnClickBtnAdd);
+            _ui.m_rewardBtn.onClick.Add(OnClickBtnReward);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+        }
+        protected override void OnHide()
+        {
+
+            base.OnHide();
+        }
+        private void UpdateView()
+        {
+            _ui.m_ticketNum.text = "999";
+            _ui.m_game1name.text = name[0];
+            _ui.m_game2name.text = name[1];
+        }
+        private void OnClickBtnBack()
+        {
+            this.Hide();
+        }
+        private void OnClickBtnShop()
+        {
+            ViewManager.Show<StoreView>(new object[] { ConstStoreTabId.STORE_EXCHANGE, ConstStoreSubId.STORE_ACTIVITY_EXCHANGE });
+        }
+        private void OnClickBtnReward()
+        {
+            ViewManager.Show<ChallengeRewardView>(new object[] { new List<int>() { 0,1 } });
+        }
+        private void OnClickBtnAdd()
+        {
+
+        }
+        private void OnClickBtnGameOne()
+        {
+            ViewManager.Show($"GFGGame.{viewName[0]}");
+            this.Hide();
+        }
+        private void OnClickBtnGameTwo()
+        {
+            ViewManager.Show($"GFGGame.{viewName[1]}");
+            this.Hide();
+        }
+    }
+}

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

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

+ 129 - 0
GameClient/Assets/Game/HotUpdate/Views/MiniGame/ResultTipsView.cs

@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class ResultTipsView : BaseView
+    {
+        private UI_ResultTipsUI _ui;
+        private bool gameResult;
+        private int timeResult;
+        private string gameName;
+
+        //通关评价
+        private List<int> CustemsNum = new List<int>()
+        {
+            10,
+            30,
+            60,
+        };
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_ResultTipsUI.PACKAGE_NAME;
+            _ui = UI_ResultTipsUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_exitBtn.onClick.Add(OnClickExit);
+            _ui.m_againBtn.onClick.Add(OnClickAgain);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+            if ((this.viewData as object[]).Length == 3)
+            {
+                gameResult = (bool)(this.viewData as object[])[0];
+                gameName = (string)(this.viewData as object[])[1];
+                timeResult = (int) (this.viewData as object[])[2];
+                
+            }
+            else
+            {
+                gameResult = (bool)(this.viewData as object[])[0];
+                gameName = (string)(this.viewData as object[])[1];
+            }
+            UpdateView();
+        }
+        private void UpdateView()
+        {
+            if(gameResult)
+            {
+                _ui.m_failTxt.visible = false;
+                _ui.m_success.visible = true ;
+                _ui.m_resultTxt.text = "通关奖励";
+                _ui.m_resultTitle.url = "ui://MiniGame/shengli_bt";
+                UpdateStar();
+            }
+            else
+            {
+                _ui.m_failTxt.visible = true;
+                _ui.m_success.visible = false;
+                _ui.m_resultTxt.text = "失败奖励";
+                _ui.m_resultTitle.url = "ui://MiniGame/shibai_bt";
+            }
+        }
+
+        private void UpdateStar()
+        {
+            int starNum = 0;
+            for (int i = CustemsNum.Count - 1; i >= 0; i--)
+            {
+                if (timeResult >= CustemsNum[i])
+                {
+                    starNum = i + 1;
+                    break;
+                }
+            }
+            switch(starNum)
+             {
+                case 1:
+                    _ui.m_star1.url = "ui://MiniGame/tb_zx_pt_star";
+                    _ui.m_star2.url = "ui://MiniGame/tb_zx_pt_star_grey";
+                    _ui.m_star3.url = "ui://MiniGame/tb_zx_pt_star_grey";
+                    break;
+                case 2:
+                    _ui.m_star1.url = "ui://MiniGame/tb_zx_pt_star";
+                    _ui.m_star2.url = "ui://MiniGame/tb_zx_pt_star";
+                    _ui.m_star3.url = "ui://MiniGame/tb_zx_pt_star_grey";
+                    break;
+                case 3:
+                    _ui.m_star1.url = "ui://MiniGame/tb_zx_pt_star";
+                    _ui.m_star2.url = "ui://MiniGame/tb_zx_pt_star";
+                    _ui.m_star3.url = "ui://MiniGame/tb_zx_pt_star";
+                    break;
+                default:
+                    break;
+            }
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+
+        private void OnClickExit()
+        {
+            this.Hide();
+            ViewManager.Hide(gameName);
+        }
+        private void OnClickAgain()
+        {
+            this.Hide();
+            ViewManager.Show(gameName);
+        }
+    }
+}

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

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

+ 42 - 0
GameClient/Assets/Game/HotUpdate/Views/MiniGame/SyntheticRoutetipView.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using ET;
+using FairyGUI;
+using UI.MiniGame;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class SyntheticRoutetipView : BaseView
+    {
+        private UI_SyntheticRouteTipUI _ui;
+        public override void Dispose()
+        {
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+            base.Dispose();
+        }
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_SyntheticRouteTipUI.PACKAGE_NAME;
+            _ui = UI_SyntheticRouteTipUI.Create();
+            this.viewCom = _ui.target;
+            isfullScreen = true;
+
+            _ui.m_bg.onClick.Add(Hide);
+        }
+        protected override void OnShown()
+        {
+            base.OnShown();
+        }
+        protected override void OnHide()
+        {
+            base.OnHide();
+        }
+    }
+}

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

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

+ 101 - 14
GameClient/Assets/Game/HotUpdate/Views/MiniGame/TZFEGameVIew.cs

@@ -18,13 +18,14 @@ namespace GFGGame
         private System.Random rand;
 
         //这个是数组的行数和列数,mapLength一般采用行列一样
-        private int rows = 5;
-        private int columns = 5;
+        private int rows = 4;
+        private int columns = 4;
         private int mapLength = 5;
         //得分
         private int score = 0;
         private int scoreMax = 0;
-        private int targetNum = 2048;
+        //目标分数
+        private int targetNum = 128;
         private bool isMove;
         private bool isMerge;
         private struct NumPos
@@ -35,7 +36,7 @@ namespace GFGGame
         }
         //需要播放动效的列表
         private List<NumPos> numPosArray = new List<NumPos>();
-
+        private int time = 0;
 
         public override void Dispose()
         {
@@ -58,6 +59,7 @@ namespace GFGGame
             _ui.target.onTouchBegin.Add(OnClickBegin);
             _ui.target.onTouchEnd.Add(OnClickEnd);
             _ui.m_backBtn.onClick.Add(OnClickBtnBack);
+            _ui.m_mergeBtn.onClick.Add(OnClickMergeTips);
             Map = new int[rows, columns];
         }
 
@@ -70,6 +72,7 @@ namespace GFGGame
         }
         protected override void OnHide()
         {
+            Timers.inst.Remove(UpdateTime);
             base.OnHide();
         }
 
@@ -88,10 +91,13 @@ namespace GFGGame
         }
         private void UpdateView()
         {
+            time = 0;
             score = 0;
-            targetNum = 2048;
+            targetNum = 64;
             _ui.m_score.text = string.Format("分数:{0}", score.ToString());
+            _ui.m_score.visible = false;
             rand = new System.Random();
+            Timers.inst.Add(1.0f, 0, UpdateTime);
         }
         private void UpdateScore()
         {
@@ -108,17 +114,15 @@ namespace GFGGame
             UI_numItem numItem = UI_numItem.Proxy(item);
             int x = index / rows;
             int y = index % columns;
-            numItem.m_numTxt.text = Map[x,y].ToString();
             if(Map[x,y] == 0)
             {
-                numItem.m_numTxt.visible = false;
+                numItem.m_icon.visible = false;
             }
             else
             {
-                numItem.m_numTxt.visible = true;
+                numItem.m_icon.url = string.Format("ui://MiniGame/sgll2_{0}", Map[x, y]);
+                numItem.m_icon.visible = true;
             }
-            //这个后续根据数组内容替换图片
-            //_ui.m_icon.url = 
             //播放生成和合并动效
             for(int i=0; i<numPosArray.Count; i++)
             {
@@ -158,7 +162,9 @@ namespace GFGGame
             }
             if(!gameOver)
             {
-                // 还需要加,无法移动,无法合并时,游戏结束
+                // 游戏结束
+                GameOver(false);
+                return;
             }
             while (true)
             {
@@ -205,7 +211,7 @@ namespace GFGGame
                 {
                     row[pos] = row[i];
                     
-                    //-----这里修改需要播放动效的列表-----
+                    //-----这里修改需要播放动效的数字位置列表-----
                     int x = 0;
                     int y = 0;
                     int nextX = 0;
@@ -287,14 +293,15 @@ namespace GFGGame
                     UpdateScore();
                     if (row[i] == targetNum)
                     {
-                        //游戏结束
+                        //游戏成功
+                        GameOver(true);
                     }
                     isMerge = true;
                 }
             }
             Remove0(row,dir,xy);
         }
-        //将合并的数字放入列表的准备
+        //将合并的数字位置放入列表的准备
         private NumPos MoveAddNum(int i, int xy, Direction dir,int length)
         {
             NumPos item = new NumPos();
@@ -418,6 +425,7 @@ namespace GFGGame
                 UpdateList();
                 numPosArray.Clear();
             }
+            CheckArray();
         }
 
         private void OnClickBegin()
@@ -450,5 +458,84 @@ namespace GFGGame
                 touchFirst = touchSecond;
         }
 
+        private void OnClickMergeTips()
+        {
+            ViewManager.Show<SyntheticRoutetipView>() ;
+        }
+        private void UpdateTime(object param = null)
+        {
+            _ui.m_timeNum.text = sec_to_hms(time);
+            time++;
+        }
+
+        //将秒数转化为时分秒 duration为秒数
+        private string sec_to_hms(int duration)
+        {
+            TimeSpan ts = new TimeSpan(0, 0, duration);
+            int _hours = 0;
+            if (ts.Days > 0)
+            {
+                _hours = ts.Days * 24;
+            }
+            string str = "";
+            if (ts.Hours > 0)
+            {
+
+                str = String.Format("{0:00}", ts.Hours + _hours) + ":" + String.Format("{0:00}", ts.Minutes) + ":" + String.Format("{0:00}", ts.Seconds);
+            }
+            if (ts.Hours == 0 && ts.Minutes > 0)
+            {
+                str = "00:";
+                if (_hours > 0)
+                {
+                    str = String.Format("{0:00}", ts.Hours + _hours) + ":";
+                }
+                str += String.Format("{0:00}", ts.Minutes) + ":" + String.Format("{0:00}", ts.Seconds);
+            }
+            if (ts.Hours == 0 && ts.Minutes == 0)
+            {
+                str = "00";
+                if (_hours > 0)
+                {
+                    str = String.Format("{0:00}", ts.Hours + _hours);
+                }
+                str += ":00:" + String.Format("{0:00}", ts.Seconds);
+            }
+            return str;
+        }
+        private void CheckArray()
+        {
+            bool gameOver = false;
+            for (int i = 0; i < rows; i++)
+            {
+                for (int j = 0; j < columns; j++)
+                {
+                    if (Map[i, j] == 0)
+                    {
+                        gameOver = true;
+                        break;
+                    }
+                }
+            }
+            if (!gameOver)
+            {
+                // 游戏结束
+                GameOver(false);
+                return;
+            }
+        }
+
+        private void GameOver(bool target)
+        {
+            Timers.inst.Remove(UpdateTime);
+            if (target)
+            {
+                ViewManager.Show<ResultTipsView>(new object[]{target, typeof(TZFEGameView).FullName, time });
+            }
+            else
+            {
+                ViewManager.Show<ResultTipsView>(new object[]{target,typeof(TZFEGameView).FullName });
+            }
+        }
     }
 }

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


+ 1 - 1
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5c2ddc318291d2e4da1750980a3b35a6
+guid: 1c60b79975a61e1419b1d4cc33fc1ca3
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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


+ 1 - 1
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5d307345c390bf94da7949c2de50be57
+guid: 53795278d3ee2c14cb85c5f8b0ac85b7
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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


+ 96 - 0
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_2.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: de024764057581c469f68dfb185ad81e
+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
+  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_3.png


+ 96 - 0
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_atlas0_3.png.meta

@@ -0,0 +1,96 @@
+fileFormatVersion: 2
+guid: 58d64be81b0adf34c91e0303b39b3e24
+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
+  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


+ 1 - 1
GameClient/Assets/ResIn/UI/MiniGame/MiniGame_fui.bytes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e8687b1c3c750724d90b43f0e9a8366b
+guid: c536a234fca2ec44f9b4c13ea67e96a8
 TextScriptImporter:
   externalObjects: {}
   userData: