| 
					
				 | 
			
			
				@@ -8,9 +8,9 @@ using ET; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    public class SuitView : BaseWindow 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public class ClothingView : BaseWindow 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        private UI_SuitUI _ui; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        private UI_ClothingUI _ui; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private GameObject _scenePrefab; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private GameObject _sceneObject; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -38,8 +38,8 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         protected override void OnInit() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             base.OnInit(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            packageName = UI_SuitUI.PACKAGE_NAME; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            _ui = UI_SuitUI.Create(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            packageName = UI_ClothingUI.PACKAGE_NAME; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            _ui = UI_ClothingUI.Create(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             this.viewCom = _ui.target; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // this.viewCom.Center(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             isfullScreen = true; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -66,11 +66,14 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_c1.onChanged.Add(OnTabChange); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // EventAgent.AddEventListener(ConstMessage.GET_SUIT_INFOS) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        protected override void AddEventListener() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             EventAgent.AddEventListener(ConstMessage.MAINTAIN_SUIT, OnListenerFoster); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             EventAgent.AddEventListener(ConstMessage.GET_MAINTAIN_SUIT_BONUS, OnListenerGetFosterReward); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             EventAgent.AddEventListener(ConstMessage.MAKE_NEW_SUIT, OnListenerRenew); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         protected override void OnShown() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             base.OnShown(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -99,13 +102,18 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         protected override void OnHide() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             base.OnHide(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            UI_ComCostCurrency.ProxyEnd(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // UI_ComCostCurrency.ProxyEnd(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        protected override void RemoveEventListener() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            EventAgent.RemoveEventListener(ConstMessage.MAINTAIN_SUIT, OnListenerFoster); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            EventAgent.RemoveEventListener(ConstMessage.GET_MAINTAIN_SUIT_BONUS, OnListenerGetFosterReward); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            EventAgent.RemoveEventListener(ConstMessage.MAKE_NEW_SUIT, OnListenerRenew); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void OnClickBtnBack() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ViewManager.GoBackFrom(typeof(SuitView).FullName); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ViewManager.GoBackFrom(typeof(ClothingView).FullName); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void OnTabChange() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -203,6 +211,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.target.data = index; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.m_finish.selectedIndex = SuitFosterDataManager.Instance.GetFosterState(_suitId, index); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.m_txtName.text = SuitFosterDataManager.Instance.stepNames[index]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            UI_ListFosterItem.ProxyEnd(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void ListPropertyItemRender(int index, GObject obj) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -211,6 +220,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             int score = (int)_propertyList.GetKey(index); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.m_txtProperty.text = _propertyList[score].ToString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.m_loaIcon.url = ResPathUtil.GetCommonGameResPath("kp_sx_" + (score)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            UI_ListPropertyItem.ProxyEnd(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void OnClickListFosterItem(EventContext context) 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -223,7 +233,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             else if (state == 1) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                ViewManager.Show<SuitFosterView>(new object[] { _suitId, index, _propertyList, _addPropertyList, this.viewData }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ViewManager.Show<ClothingFosterView>(new object[] { _suitId, index, _propertyList, _addPropertyList, this.viewData }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             else 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -235,7 +245,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             SuitFosterDataManager.Instance.GetFosterRewardState(_suitId, out int state, out int index); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (state == 1 || state == 2) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                ViewManager.Show<SuitRewardView>(_suitId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ViewManager.Show<ClothingFosterRewardView>(_suitId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             else 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -244,26 +254,20 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void OnClickBtnPropertyShow() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ViewManager.Show<SuitPropertyShowView>(new object[] { _suitId, _index }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ViewManager.Show<ClothingPropertyShowView>(new object[] { _suitId, _index }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void OnListenerFoster() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_comFosterAni.target.visible = true; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_comFosterAni.m_txtContent.text = string.Format("服装{0}中......", SuitFosterDataManager.Instance.stepNames[_index]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // _ui.m_comFosterAni.m_proFoster.value = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             string resPath = ResPathUtil.GetViewEffectPath("ui_gcdh", "ui_gcdh_" + (_index + 1)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             SceneController.AddObjectToView(_gameobject1, _wrapper1, _ui.m_comFosterAni.m_holder, resPath, out _gameobject1, out _wrapper1); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // _ui.m_comFosterAni.m_proFoster.TweenValue(100, 4f).OnComplete(() => 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //     ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //     UpdateFoster(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            //     _ui.m_comFosterAni.target.visible = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            // }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             _ui.m_comFosterAni.m_t0.Play(() => 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                ViewManager.Show<SuitFosterFinishView>(new object[] { _suitId, _index, _propertyList }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                ViewManager.Show<ClothingFosterFinishView>(new object[] { _suitId, _index, _propertyList }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 UpdateFoster(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 _ui.m_comFosterAni.target.visible = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -314,6 +318,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             int need = renewCfg.costNum; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             comConsumeCurrency.m_txtNeed.text = StringUtil.GetColorText(need.ToString(), has >= need ? "#FFF8EA" : "#C9F1A5"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (_canRenew && has < need) _canRenew = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            UI_ComCostCurrency.ProxyEnd(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void UpdateRenewFinish() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -345,12 +350,13 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.m_txtNeed.text = need.ToString(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (_canRenew && has < need) _canRenew = false; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             item.target.data = materialsArr[index][0]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            UI_ListMaterialsItem.ProxyEnd(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void OnListRenewMaterialsItem(EventContext context) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             int itemId = (int)(context.data as GComponent).data; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             // GoodsItemTipsController.ShowItemTips(itemId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(SuitView).FullName, this.viewData } }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ViewManager.Show(ViewName.APPROACH_OF_ITEM_VIEW, new object[] { itemId, new object[] { typeof(ClothingView).FullName, this.viewData } }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private async void OnClickBtnRenew() 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -376,7 +382,7 @@ namespace GFGGame 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         private void OnListenerRenew() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ViewManager.Show<SuitRenewFinishView>(_suitId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            ViewManager.Show<ClothingRenewFinishView>(_suitId); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             UpdateRenew(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             Debug.Log("换新奖励:" + ItemDataManager.GetItemNum(10370)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |