添加华容道UI逻辑；添加寻奇访胜加速逻辑；添加ResIn/Material的加载路径

GameClient/Assets/AssetBundleCollectorSetting.asset

@@ -67,6 +67,14 @@ MonoBehaviour:
         FilterRuleName: CollectAll
         AssetTags: 
         UserData: 
+      - CollectPath: Assets/ResIn/Material
+        CollectorGUID: 003a7ea568804294c94a860b7ce88416
+        CollectorType: 0
+        AddressRuleName: AddressByFileName
+        PackRuleName: PackDirectory
+        FilterRuleName: CollectAll
+        AssetTags: 
+        UserData: 
     - GroupName: launcher
       GroupDesc: 
       AssetTags: preload

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoEntryUI.cs

@@ -8,14 +8,13 @@ namespace UI.ActivityHuaRongDao
     {
         public GComponent target;
         public GLoader m_loaBg;
-        public GButton m_btnBack;
         public GButton m_btnRule;
-        public GLoader m_activityImg;
-        public GTextField m_txtTime;
         public UI_scrollPane m_scrollPane;
+        public GTextField m_challengeTimes;
         public GTextField m_curLevel;
+        public GTextField m_txtTime;
         public GButton m_btnStart;
-        public GTextField m_challengeTimes;
+        public GButton m_btnBack;
         public const string URL = "ui://wf8geywtltoy4";
         public const string PACKAGE_NAME = "ActivityHuaRongDao";
         public const string RES_NAME = "ActivityHuaRongDaoEntryUI";
@@ -64,27 +63,25 @@ namespace UI.ActivityHuaRongDao
         private void Init(GComponent comp)
         {
             m_loaBg = (GLoader)comp.GetChild("loaBg");
-            m_btnBack = (GButton)comp.GetChild("btnBack");
             m_btnRule = (GButton)comp.GetChild("btnRule");
-            m_activityImg = (GLoader)comp.GetChild("activityImg");
-            m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_scrollPane = (UI_scrollPane)UI_scrollPane.Create(comp.GetChild("scrollPane"));
+            m_challengeTimes = (GTextField)comp.GetChild("challengeTimes");
             m_curLevel = (GTextField)comp.GetChild("curLevel");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
             m_btnStart = (GButton)comp.GetChild("btnStart");
-            m_challengeTimes = (GTextField)comp.GetChild("challengeTimes");
+            m_btnBack = (GButton)comp.GetChild("btnBack");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_loaBg = null;
-            m_btnBack = null;
             m_btnRule = null;
-            m_activityImg = null;
-            m_txtTime = null;
             m_scrollPane.Dispose();
             m_scrollPane = null;
+            m_challengeTimes = null;
             m_curLevel = null;
+            m_txtTime = null;
             m_btnStart = null;
-            m_challengeTimes = null;
+            m_btnBack = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_ActivityHuaRongDaoUI.cs

@@ -12,6 +12,8 @@ namespace UI.ActivityHuaRongDao
         public GTextField m_seconds;
         public GGroup m_tips;
         public GButton m_btnBack;
+        public GButton m_btnLookPic;
+        public GButton m_btnRefresh;
         public const string URL = "ui://wf8geywtnx120";
         public const string PACKAGE_NAME = "ActivityHuaRongDao";
         public const string RES_NAME = "ActivityHuaRongDaoUI";
@@ -64,6 +66,8 @@ namespace UI.ActivityHuaRongDao
             m_seconds = (GTextField)comp.GetChild("seconds");
             m_tips = (GGroup)comp.GetChild("tips");
             m_btnBack = (GButton)comp.GetChild("btnBack");
+            m_btnLookPic = (GButton)comp.GetChild("btnLookPic");
+            m_btnRefresh = (GButton)comp.GetChild("btnRefresh");
         }
         public void Dispose(bool disposeTarget = false)
         {
@@ -74,6 +78,8 @@ namespace UI.ActivityHuaRongDao
             m_seconds = null;
             m_tips = null;
             m_btnBack = null;
+            m_btnLookPic = null;
+            m_btnRefresh = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_item.cs

@@ -7,7 +7,7 @@ namespace UI.ActivityHuaRongDao
     public partial class UI_item
     {
         public GComponent target;
-        public GGraph m_item;
+        public GLoader m_icon;
         public GTextField m_index;
         public const string URL = "ui://wf8geywtnx121";
         public const string PACKAGE_NAME = "ActivityHuaRongDao";
@@ -56,12 +56,12 @@ namespace UI.ActivityHuaRongDao
 
         private void Init(GComponent comp)
         {
-            m_item = (GGraph)comp.GetChild("item");
+            m_icon = (GLoader)comp.GetChild("icon");
             m_index = (GTextField)comp.GetChild("index");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_item = null;
+            m_icon = null;
             m_index = null;
             if(disposeTarget && target != null)
             {

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_level.cs → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_progressBarItem.cs

@@ -4,20 +4,18 @@ using FairyGUI;
 
 namespace UI.ActivityHuaRongDao
 {
-    public partial class UI_level
+    public partial class UI_progressBarItem
     {
         public GComponent target;
         public Controller m_light;
-        public GTextField m_levelNum;
-        public GGraph m_reward;
         public const string URL = "ui://wf8geywtltoye";
         public const string PACKAGE_NAME = "ActivityHuaRongDao";
-        public const string RES_NAME = "level";
-        private static UI_level _proxy;
+        public const string RES_NAME = "progressBarItem";
+        private static UI_progressBarItem _proxy;
 
-        public static UI_level Create(GObject gObject = null)
+        public static UI_progressBarItem Create(GObject gObject = null)
         {
-            var ui = new UI_level();
+            var ui = new UI_progressBarItem();
             if(gObject == null)
             	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
@@ -26,11 +24,11 @@ namespace UI.ActivityHuaRongDao
             return ui;
         }
 
-        public static UI_level Proxy(GObject gObject = null)
+        public static UI_progressBarItem Proxy(GObject gObject = null)
         {
             if(_proxy == null)
             {
-                _proxy = new UI_level();
+                _proxy = new UI_progressBarItem();
             }
             var ui = _proxy;
             if(gObject == null)
@@ -58,14 +56,10 @@ namespace UI.ActivityHuaRongDao
         private void Init(GComponent comp)
         {
             m_light = comp.GetController("light");
-            m_levelNum = (GTextField)comp.GetChild("levelNum");
-            m_reward = (GGraph)comp.GetChild("reward");
         }
         public void Dispose(bool disposeTarget = false)
         {
             m_light = null;
-            m_levelNum = null;
-            m_reward = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_level.cs.meta → GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_progressBarItem.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5094eb4e44546d14abca4517cef4ca46
+guid: 5357c6a76ace4e942b8f35579ec98650
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_progressBgItem.cs

@@ -0,0 +1,71 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.ActivityHuaRongDao
+{
+    public partial class UI_progressBgItem
+    {
+        public GComponent target;
+        public GTextField m_levelNum;
+        public const string URL = "ui://wf8geywtl5izw";
+        public const string PACKAGE_NAME = "ActivityHuaRongDao";
+        public const string RES_NAME = "progressBgItem";
+        private static UI_progressBgItem _proxy;
+
+        public static UI_progressBgItem Create(GObject gObject = null)
+        {
+            var ui = new UI_progressBgItem();
+            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_progressBgItem Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_progressBgItem();
+            }
+            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_levelNum = (GTextField)comp.GetChild("levelNum");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_levelNum = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_progressBgItem.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_reward.cs

@@ -6,9 +6,10 @@ namespace UI.ActivityHuaRongDao
 {
     public partial class UI_reward
     {
-        public GComponent target;
-        public UI_level m_level;
-        public const string URL = "ui://wf8geywtltoyb";
+        public GButton target;
+        public Controller m_c1;
+        public GLoader m_loaIcon;
+        public const string URL = "ui://wf8geywtl5iz1e";
         public const string PACKAGE_NAME = "ActivityHuaRongDao";
         public const string RES_NAME = "reward";
         private static UI_reward _proxy;
@@ -17,9 +18,9 @@ namespace UI.ActivityHuaRongDao
         {
             var ui = new UI_reward();
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -32,9 +33,9 @@ namespace UI.ActivityHuaRongDao
             }
             var ui = _proxy;
             if(gObject == null)
-            	ui.target =  (GComponent)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
+            	ui.target =  (GButton)UIPackage.CreateObject(PACKAGE_NAME, RES_NAME);
             else
-            	ui.target =  (GComponent)gObject;
+            	ui.target =  (GButton)gObject;
             ui.Init(ui.target);
             return ui;
         }
@@ -55,12 +56,13 @@ namespace UI.ActivityHuaRongDao
 
         private void Init(GComponent comp)
         {
-            m_level = (UI_level)UI_level.Create(comp.GetChild("level"));
+            m_c1 = comp.GetController("c1");
+            m_loaIcon = (GLoader)comp.GetChild("loaIcon");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_level.Dispose();
-            m_level = null;
+            m_c1 = null;
+            m_loaIcon = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/ActivityHuaRongDao/UI_scrollPane.cs

@@ -7,8 +7,9 @@ namespace UI.ActivityHuaRongDao
     public partial class UI_scrollPane
     {
         public GComponent target;
-        public GProgressBar m_progress;
-        public GList m_list;
+        public GList m_listBg;
+        public GList m_listBar;
+        public GList m_listItems;
         public const string URL = "ui://wf8geywtltoy7";
         public const string PACKAGE_NAME = "ActivityHuaRongDao";
         public const string RES_NAME = "scrollPane";
@@ -56,13 +57,15 @@ namespace UI.ActivityHuaRongDao
 
         private void Init(GComponent comp)
         {
-            m_progress = (GProgressBar)comp.GetChild("progress");
-            m_list = (GList)comp.GetChild("list");
+            m_listBg = (GList)comp.GetChild("listBg");
+            m_listBar = (GList)comp.GetChild("listBar");
+            m_listItems = (GList)comp.GetChild("listItems");
         }
         public void Dispose(bool disposeTarget = false)
         {
-            m_progress = null;
-            m_list = null;
+            m_listBg = null;
+            m_listBar = null;
+            m_listItems = null;
             if(disposeTarget && target != null)
             {
                 target.RemoveFromParent();

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelTimeDetailUI.cs

@@ -0,0 +1,95 @@
+/** This is an automatically generated class by FairyGUI. Please do not modify it. **/
+
+using FairyGUI;
+
+namespace UI.Travel
+{
+    public partial class UI_TravelTimeDetailUI
+    {
+        public GComponent target;
+        public GComponent m_bg;
+        public GTextField m_txtTime;
+        public GButton m_btnFinish;
+        public GButton m_btnSpeedUp;
+        public GLoader m_iconFinishSpend;
+        public GTextField m_numFinishSpend;
+        public GLoader m_iconSpeedUpSpend;
+        public GTextField m_numSpeedUpSpend;
+        public GComponent m_comValueBar;
+        public const string URL = "ui://jitclg1gghq1110";
+        public const string PACKAGE_NAME = "Travel";
+        public const string RES_NAME = "TravelTimeDetailUI";
+        private static UI_TravelTimeDetailUI _proxy;
+
+        public static UI_TravelTimeDetailUI Create(GObject gObject = null)
+        {
+            var ui = new UI_TravelTimeDetailUI();
+            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_TravelTimeDetailUI Proxy(GObject gObject = null)
+        {
+            if(_proxy == null)
+            {
+                _proxy = new UI_TravelTimeDetailUI();
+            }
+            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 = (GComponent)comp.GetChild("bg");
+            m_txtTime = (GTextField)comp.GetChild("txtTime");
+            m_btnFinish = (GButton)comp.GetChild("btnFinish");
+            m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
+            m_iconFinishSpend = (GLoader)comp.GetChild("iconFinishSpend");
+            m_numFinishSpend = (GTextField)comp.GetChild("numFinishSpend");
+            m_iconSpeedUpSpend = (GLoader)comp.GetChild("iconSpeedUpSpend");
+            m_numSpeedUpSpend = (GTextField)comp.GetChild("numSpeedUpSpend");
+            m_comValueBar = (GComponent)comp.GetChild("comValueBar");
+        }
+        public void Dispose(bool disposeTarget = false)
+        {
+            m_bg = null;
+            m_txtTime = null;
+            m_btnFinish = null;
+            m_btnSpeedUp = null;
+            m_iconFinishSpend = null;
+            m_numFinishSpend = null;
+            m_iconSpeedUpSpend = null;
+            m_numSpeedUpSpend = null;
+            m_comValueBar = null;
+            if(disposeTarget && target != null)
+            {
+                target.RemoveFromParent();
+                target.Dispose();
+            }
+            target = null;
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelTimeDetailUI.cs.meta

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

GameClient/Assets/Game/HotUpdate/FairyGUI/GenCode/Travel/UI_TravelUI.cs

@@ -20,6 +20,7 @@ namespace UI.Travel
         public GButton m_btnTips;
         public GTextField m_txtTips;
         public GGroup m_grpTips;
+        public GButton m_btnSpeedUp;
         public UI_Button2 m_btnGo;
         public UI_Button6 m_btnGet;
         public GButton m_btnPhoto;
@@ -84,6 +85,7 @@ namespace UI.Travel
             m_btnTips = (GButton)comp.GetChild("btnTips");
             m_txtTips = (GTextField)comp.GetChild("txtTips");
             m_grpTips = (GGroup)comp.GetChild("grpTips");
+            m_btnSpeedUp = (GButton)comp.GetChild("btnSpeedUp");
             m_btnGo = (UI_Button2)UI_Button2.Create(comp.GetChild("btnGo"));
             m_btnGet = (UI_Button6)UI_Button6.Create(comp.GetChild("btnGet"));
             m_btnPhoto = (GButton)comp.GetChild("btnPhoto");
@@ -104,6 +106,7 @@ namespace UI.Travel
             m_btnTips = null;
             m_txtTips = null;
             m_grpTips = null;
+            m_btnSpeedUp = null;
             m_btnGo.Dispose();
             m_btnGo = null;
             m_btnGet.Dispose();

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoEntryView.cs

@@ -28,8 +28,9 @@ namespace GFGGame
             _ui.m_btnBack.onClick.Add(OnBtnBackClick);
 
             InitIDList();
-            _ui.m_scrollPane.m_list.itemRenderer = RenderListReward;
-            
+            _ui.m_scrollPane.m_listBg.itemRenderer = RenderListItem;
+            _ui.m_scrollPane.m_listItems.itemRenderer = RenderRewardListItem;
+            //_ui.m_scrollPane.m_listBg.onClickItem.Add(OnClickReward);
         }
 
         public override void Dispose()
@@ -80,82 +81,77 @@ namespace GFGGame
 
         private void InitInfo()
         {
-            _ui.m_scrollPane.m_list.numItems = IDList.Count;
             _ui.m_curLevel.text = curLevel.ToString();
             _ui.m_challengeTimes.SetVar("have", haveTimes.ToString())
                 .SetVar("sum", HuarongRoadGameArray.Instance.GetCfg(IDList[curLevel]).comsumeLimit.ToString()).FlushVars();
 
-            _ui.m_scrollPane.m_list.ResizeToFit();
-            InitProgressWidth();
+            InitProgress();
             ProgressAutoLocate();
         }
 
+        private void InitProgress()
+        {
+            _ui.m_scrollPane.m_listBar.numItems = curLevel;
+            _ui.m_scrollPane.m_listBg.numItems = IDList.Count;
+            _ui.m_scrollPane.m_listItems.numItems = IDList.Count;
+            _ui.m_scrollPane.m_listBg.ResizeToFit();
+            //_ui.m_scrollPane.m_listBg.width = IDList.Count * 244 + (IDList)
+            //_ui.m_scrollPane.m_listBg.
+        }
+
+
         private void ProgressAutoLocate()
         {
             _ui.m_scrollPane.target.scrollPane.posX
-                = curLevel * (_ui.m_scrollPane.m_list.GetChildAt(0).width + _ui.m_scrollPane.m_list.columnGap);
+                = curLevel * (_ui.m_scrollPane.m_listBg.GetChildAt(0).width + _ui.m_scrollPane.m_listBg.columnGap) 
+                + (curLevel > 0 ? -100 : 0);
         }
 
-        private void OnBtnBackClick()
+        private void RenderListItem(int index, GObject gObject)
         {
-            Hide();
+            gObject.data = index;
+            UI_progressBgItem item = UI_progressBgItem.Proxy(gObject);
+            item.m_levelNum.text = (index + 1).ToString();
+            UI_progressBgItem.ProxyEnd();
         }
 
-        private void OnBtnRuleClick()
+        private void RenderRewardListItem(int index, GObject gObject)
         {
-
+            gObject.data = index;
+            UI_reward reward = UI_reward.Proxy(gObject);
+            int id = HuarongRoadGameArray.Instance.GetCfg(IDList[index]).bonusWinArr[0][0];
+            reward.m_loaIcon.url = ResPathUtil.GetIconPath(ItemCfgArray.Instance.GetCfg(id));
+            reward.m_c1.SetSelectedIndex(curLevel > index ? 1 : 0);
+            reward.target.touchable = (curLevel <= index);
+            reward.target.data = index;
+            reward.target.onClick.Add(OnClickReward);
+            UI_reward.ProxyEnd();
         }
 
-        private void OnBtnStartClick()
+
+        private void OnClickReward(EventContext eventContext)
         {
-            ViewManager.Show<ActivityHuaRongDaoView>(HuarongRoadGameArray.Instance.GetCfg(IDList[curLevel]));
+            GObject obj = (GObject)eventContext.sender;
+            int id = (int)obj.data;
+            ViewManager.Show<GiftDetailView>(HuarongRoadGameArray.Instance.GetCfg(IDList[id]).bonusWinArr);
         }
 
-        private void InitProgressWidth()
+        private void OnBtnBackClick()
         {
-            GProgressBar gProgressBar = _ui.m_scrollPane.m_progress;
-            // 根据列表 初始化进度条长度
-            float marginLeft = 149;
-            gProgressBar.width = marginLeft + _ui.m_scrollPane.m_list.GetChildAt(_ui.m_scrollPane.m_list.numChildren - 1).position.x 
-                - _ui.m_scrollPane.m_list.GetChildAt(0).position.x;
-
-            // 初始化进度条值
-            int indexDay = curLevel;
-            gProgressBar.value = CalculateProgressValue(indexDay, _ui.m_scrollPane.m_list.numChildren);
+            Hide();
         }
 
-        private double CalculateProgressValue(int indexDay, int sumDay)
+        private void OnBtnRuleClick()
         {
-            int defaultLen = 18;
-            if (indexDay == sumDay)
-            {
-                return 100;
-            }
-            if (indexDay == 1)
-            {
-                return defaultLen;
-            }
 
-            return defaultLen + (100 - defaultLen) / (sumDay - 1) * (indexDay - 1);
         }
 
-        private void RenderListReward(int index, GObject item)
+        private void OnBtnStartClick()
         {
-            item.data = index;
-            UI_reward rewardUI = UI_reward.Proxy(item);
-            rewardUI.m_level.m_levelNum.text = (index + 1).ToString();
-            rewardUI.m_level.m_light.SetSelectedIndex(curLevel > index ? 0 : 1);
-            rewardUI.m_level.m_reward.touchable = (index >= curLevel);
-            rewardUI.m_level.m_reward.data = index;
-            rewardUI.m_level.m_reward.onClick.Add(OnClickReward);
-            UI_reward.ProxyEnd();
+            ViewManager.Show<ActivityHuaRongDaoView>(HuarongRoadGameArray.Instance.GetCfg(IDList[curLevel]));
         }
 
-        private void OnClickReward(EventContext eventContext)
-        {
-            GObject obj = (GObject)eventContext.sender;
-            int id = (int)obj.data;
-            ViewManager.Show<GiftDetailView>(HuarongRoadGameArray.Instance.GetCfg(IDList[id]).bonusWinArr);
-        }
+
+
     }
 }

GameClient/Assets/Game/HotUpdate/Views/ActivityHuaRongDao/ActivityHuaRongDaoView.cs

@@ -90,6 +90,10 @@ namespace GFGGame
         {
             //List<int> numList = GetRandomArr(1, 8);
             List<int> numList = GetArrByConfigStep(cfg.step);
+            while (CheckListCorrect(numList))
+            {
+                numList = GetArrByConfigStep(cfg.step);
+            }
             Vector2 originPos = _ui.m_item.target.position;
 
             for (int i = 0; i < _gridNum; i++)
@@ -103,6 +107,23 @@ namespace GFGGame
         }
 
         /// <summary>
+        /// 检测是否是连续数组
+        /// </summary>
+        /// <param name="numList"></param>
+        /// <returns></returns>
+        private bool CheckListCorrect(List<int> numList)
+        {
+            for (int i = 0; i < numList.Count - 1; i++)
+            {
+                if (numList[i + 1] != numList[i] + 1)
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        /// <summary>
         /// 随机排序 min~max 连续的数字
         /// </summary>
         /// <param name="min"></param>
@@ -139,15 +160,15 @@ namespace GFGGame
         private List<int> GetArrByConfigStep(int configStep)
         {
             List<int> list = new List<int>();
+
+            list.Add(0);
             for (int i = 1; i <= 8; i++)
             {
                 list.Add(i);
             }
-            // 最后一个是空的
-            list.Add(0);
 
             int num = 0;
-            Vector2 zeroPos = new Vector2(2, 2);
+            Vector2 zeroPos = new Vector2(0, 0);
             Vector2[] dirArr = { new Vector2(-1, 0), new Vector2(1, 0), new Vector2(0, -1), new Vector2(0, 1) };
             Vector2 lastPos = zeroPos;
             while (num < configStep)
@@ -183,6 +204,7 @@ namespace GFGGame
                     _items[itemIndex].position = _gridArr[i, j].pos;
                     UI_item item = UI_item.Proxy(_items[itemIndex]);
                     item.m_index.text = _gridArr[i, j].num.ToString();
+                    item.m_icon.url = string.Format("ui://ActivityHuaRongDao/hrd_1-{0}", _gridArr[i, j].num + 1);
                     _items[itemIndex].data = _gridArr[i, j].num;
                     UI_item.ProxyEnd();
                     ++itemIndex;
@@ -213,10 +235,13 @@ namespace GFGGame
             if (newGrid != null)
             {
                 _ui.m_items.target.touchable = false;
-                obj.TweenMove(newGrid.pos, 0.1f).OnComplete(()=>
+                obj.TweenMove(newGrid.pos, 0.1f).OnComplete(() =>
                 {
                     _ui.m_items.target.touchable = true;
-                    CheckWin();
+                    if (CheckWin())
+                    {
+                        Win();
+                    }
                 });
             }
         }
@@ -294,7 +319,7 @@ namespace GFGGame
             return _gridArr[(int)nullGridindex.x, (int)nullGridindex.y];
         }
 
-        private void CheckWin()
+        private bool CheckWin()
         {
             int num = 0;
             for (int i = 0; i < _gridNum; i++)
@@ -304,9 +329,9 @@ namespace GFGGame
                     if (i == 0 && j == 0)
                     {
                         num = _gridArr[i, j].num;
-                        if(num != 1)
+                        if (num != 0)
                         {
-                            return;
+                            return false;
                         }
                     }
                     else
@@ -314,7 +339,7 @@ namespace GFGGame
                         // 不连续 没有胜利
                         if (_gridArr[i, j].num != num + 1)
                         {
-                            return;
+                            return false;
                         }
                         // 继续检测
                         else
@@ -323,24 +348,30 @@ namespace GFGGame
                             // 胜利
                             if (num == _gridNum * _gridNum - 1)
                             {
-                                // 关卡推进
-                                int passLevel = cfg.resArr[0];
-                                ActivityHuaRongDaoEntryView.curLevel = Mathf.Max(passLevel, ActivityHuaRongDaoEntryView.curLevel);
-                                EventAgent.DispatchEvent(ConstMessage.ACTIVITY_HUARONGDAO_UPDATE);
-                                // 弹出成功界面
-                                ViewManager.Show<ActivityHuaRongDaoSuccessView>(cfg);
+                                return true;
                             }
                         }
                     }
 
                 }
             }
+            return false;
+        }
+
+        private void Win()
+        {
+            // 关卡推进
+            int passLevel = cfg.resArr[0];
+            ActivityHuaRongDaoEntryView.curLevel = Mathf.Max(passLevel, ActivityHuaRongDaoEntryView.curLevel);
+            EventAgent.DispatchEvent(ConstMessage.ACTIVITY_HUARONGDAO_UPDATE);
+            // 弹出成功界面
+            ViewManager.Show<ActivityHuaRongDaoSuccessView>(cfg);
         }
 
         private int countDownNum;
         private void Countdown(object param)
         {
-            _ui.m_seconds.text = countDownNum.ToString();
+            _ui.m_seconds.text = countDownNum.ToString() + "s";
             --countDownNum;
 
             if (countDownNum < 0)

GameClient/Assets/Game/HotUpdate/Views/ClothingSynthetic/ClothingSyntheticView.cs

@@ -491,7 +491,7 @@ namespace GFGGame
         /// </summary>
         private void SetSoftMask()
         {
-            var handle = YooAssets.LoadAssetSync<Material>(ResPathUtil.GetPrefabPath("ImageGradient", "mat"));
+            var handle = YooAssets.LoadAssetSync<Material>(ResPathUtil.GetMaterialPath("ImageGradient"));
             Material m = handle.AssetObject as Material;
             Material copyM = new Material(m.shader);
             handle.Release();

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelTimeDetailView.cs

@@ -0,0 +1,101 @@
+using System.Collections;
+using UnityEngine;
+using UI.Travel;
+using ET;
+using FairyGUI;
+
+namespace GFGGame
+{
+    public class TravelTimeDetailView : BaseWindow
+    {
+        private UI_TravelTimeDetailUI _ui;
+        private ValueBarController _valueBarController;
+
+        public override void Dispose()
+        {
+            if (_valueBarController != null)
+            {
+                _valueBarController.Dispose();
+                _valueBarController = null;
+            }
+
+            if (_ui != null)
+            {
+                _ui.Dispose();
+                _ui = null;
+            }
+
+            base.Dispose();
+        }
+
+        protected override void OnInit()
+        {
+            base.OnInit();
+            packageName = UI_TravelTimeDetailUI.PACKAGE_NAME;
+            _ui = UI_TravelTimeDetailUI.Create();
+            viewCom = _ui.target;
+            viewCom.Center();
+            modal = true;
+            viewAnimationType = EnumViewAnimationType.ZOOM_CENTER;
+
+            _valueBarController = new ValueBarController(_ui.m_comValueBar);
+            _ui.m_btnFinish.onClick.Add(OnClickBtnFinish);
+            _ui.m_btnSpeedUp.onClick.Add(OnClickBtnSpeedUp);
+        }
+
+        protected override void OnShown()
+        {
+            base.OnShown();
+
+            _valueBarController.OnShown();
+            UpdateTime(null);
+            Timers.inst.Add(1, -1, UpdateTime);
+        }
+
+        protected override void OnHide()
+        {
+            base.OnHide();
+            Timers.inst.Remove(UpdateTime);
+            _valueBarController.OnHide();
+        }
+
+        private void UpdateTime(object param)
+        {
+            long endTime = TravelDataManager.Instance.TravelData.EndTime;
+            long curTime = TimeHelper.ServerNow();
+            long time = endTime - curTime;
+
+            if (curTime >= endTime)
+            {
+                Hide();
+                return;
+            }
+
+            string timeStr = TimeUtil.FormattingTimeTo_HHmmss(time);
+            _ui.m_txtTime.text = timeStr;
+            CalculateNum(timeStr);
+        }
+
+        /// <summary>
+        /// 计算立即完成需要的总消耗
+        /// </summary>
+        /// <param name="timeStr"></param>
+        private void CalculateNum(string timeStr)
+        {
+            string[] strArr = timeStr.Split(':');
+
+            int num = int.Parse(strArr[0]) + (int.Parse(strArr[1]) > 0 ? 1 : 0);
+            _ui.m_numFinishSpend.text = num.ToString();
+        }
+
+        private void OnClickBtnFinish()
+        {
+            int spendNum = int.Parse(_ui.m_numFinishSpend.text);
+        }
+
+        private void OnClickBtnSpeedUp()
+        {
+            int spendNum = int.Parse(_ui.m_numSpeedUpSpend.text);
+        }
+    }
+}

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelTimeDetailView.cs.meta

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

GameClient/Assets/Game/HotUpdate/Views/Travel/TravelView.cs

@@ -54,6 +54,7 @@ namespace GFGGame
             _ui.m_btnGet.target.onClick.Add(OnBtnGetClick);
             _ui.m_btnPhoto.onClick.Add(OnBtnPhotoClick);
             _ui.m_btnFieldGuide.onClick.Add(OnBtnFieldGuideClick);
+            _ui.m_btnSpeedUp.onClick.Add(OnBtnSpeedUpClick);
 
             _ui.m_loaBg.url = ResPathUtil.GetBgImgPath("cj_bg_ychm");
 
@@ -207,5 +208,10 @@ namespace GFGGame
         {
             RedDotController.Instance.SetComRedDot(_ui.m_btnFieldGuide, RedDotDataManager.Instance.GetTravelGuideRed(), "", -15, 8);
         }
+
+        private void OnBtnSpeedUpClick()
+        {
+            ViewManager.Show<TravelTimeDetailView>();
+        }
     }
 }

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1!a.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: 527f02f57d860a447ae5ed332ac7512c
+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: 

GameClient/Assets/ResIn/UI/ActivityHuaRongDao/ActivityHuaRongDao_atlas0_1.png.meta

@@ -0,0 +1,120 @@
+fileFormatVersion: 2
+guid: b214dcd725a277546b1080d013ed708f
+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: