|
@@ -13,17 +13,19 @@ namespace GFGGame
|
|
|
private UI_LuckyBoxUI _ui;
|
|
|
private ValueBarController _valueBarController;
|
|
|
|
|
|
- private GameObject _gameObject;
|
|
|
- private GoWrapper _wrapper;
|
|
|
- private GameObject _gameObject1;
|
|
|
- private GoWrapper _wrapper1;
|
|
|
- private GameObject _gameObject2;
|
|
|
- private GoWrapper _wrapper2;
|
|
|
- private GameObject _gameObject3;
|
|
|
- private GoWrapper _wrapper3;
|
|
|
-
|
|
|
- private GameObject _gameObject4;
|
|
|
+ //private GameObject _gameObject;
|
|
|
+ //private GoWrapper _wrapper;
|
|
|
+ //private GameObject _gameObject1;
|
|
|
+ //private GoWrapper _wrapper1;
|
|
|
+ //private GameObject _gameObject2;
|
|
|
+ //private GoWrapper _wrapper2;
|
|
|
+ //private GameObject _gameObject3;
|
|
|
+ //private GoWrapper _wrapper3;
|
|
|
+
|
|
|
+ private GameObject _scenePrefab;
|
|
|
+ private GameObject _sceneObject;
|
|
|
private GoWrapper _wrapper4;
|
|
|
+ private DressUpObj _dressUpObj;
|
|
|
private GameObject _gameObject5;
|
|
|
private GoWrapper _wrapper5;
|
|
|
|
|
@@ -38,10 +40,21 @@ namespace GFGGame
|
|
|
_valueBarController.Dispose();
|
|
|
_valueBarController = null;
|
|
|
}
|
|
|
- SceneController.DestroyObjectFromView(_gameObject, _wrapper);
|
|
|
- SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
|
|
|
- SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
|
|
|
- SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
|
|
|
+ if (_sceneObject != null)
|
|
|
+ {
|
|
|
+ GameObject.Destroy(_sceneObject);
|
|
|
+ _sceneObject = null;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (_dressUpObj != null)
|
|
|
+ {
|
|
|
+ _dressUpObj.Dispose();
|
|
|
+ _dressUpObj = null;
|
|
|
+ }
|
|
|
+ //SceneController.DestroyObjectFromView(_gameObject, _wrapper);
|
|
|
+ //SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
|
|
|
+ //SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
|
|
|
+ //SceneController.DestroyObjectFromView(_gameObject3, _wrapper3);
|
|
|
|
|
|
if (_ui != null)
|
|
|
{
|
|
@@ -59,6 +72,8 @@ namespace GFGGame
|
|
|
this.viewCom = _ui.target;
|
|
|
isfullScreen = true;
|
|
|
|
|
|
+ _scenePrefab = GFGAsset.Load<GameObject>(ResPathUtil.GetPrefabPath("SceneDressUp"));
|
|
|
+ _dressUpObj = new DressUpObj();
|
|
|
// _ui.m_txtRemainTimes.visible = false;
|
|
|
_valueBarController = new ValueBarController(_ui.m_valueBar);
|
|
|
_ui.m_btnBack.onClick.Add(OnClickBtnBack);
|
|
@@ -72,6 +87,7 @@ namespace GFGGame
|
|
|
_ui.m_listBg.itemProvider = GetListItemResource;
|
|
|
_ui.m_listBg.scrollPane.onScrollEnd.Add(OnListBgScroll);
|
|
|
|
|
|
+
|
|
|
}
|
|
|
protected override void AddEventListener()
|
|
|
{
|
|
@@ -187,9 +203,32 @@ namespace GFGGame
|
|
|
(obj as GComponent).GetChild("txtTime").asTextField.text = string.Format("剩余{0}{1}", num, str);
|
|
|
GGraph holder = (obj as GComponent).GetChild("holder").asGraph;
|
|
|
GGraph holder1 = (obj as GComponent).GetChild("holder1").asGraph;
|
|
|
- SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(201013);//羲和
|
|
|
- string resPath1 = ResPathUtil.GetDressUpAnimationPath(suitCfg.aniRes);
|
|
|
- SceneController.AddObjectToView(_gameObject4, _wrapper4, holder, resPath1, out _gameObject4, out _wrapper4);
|
|
|
+
|
|
|
+
|
|
|
+ if (_sceneObject != null)
|
|
|
+ {
|
|
|
+ GameObject.Destroy(_sceneObject);
|
|
|
+ _sceneObject = null;
|
|
|
+ }
|
|
|
+ _sceneObject = GameObject.Instantiate(_scenePrefab);
|
|
|
+ int scale = 100;
|
|
|
+ _sceneObject.transform.localScale = new Vector3(scale, scale, scale);
|
|
|
+ _dressUpObj.setSceneObj(_sceneObject, false, false, null, false);
|
|
|
+ _dressUpObj.PutOnDefaultDressUpData();
|
|
|
+ _dressUpObj.PutOnSuitCfg(201013, true, null, false, false);
|
|
|
+ if (_wrapper4 == null)
|
|
|
+ {
|
|
|
+ _wrapper4 = new GoWrapper(_sceneObject);
|
|
|
+ holder.SetNativeObject(_wrapper4);
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ _wrapper4.wrapTarget = _sceneObject;
|
|
|
+ }
|
|
|
+
|
|
|
+ //SuitCfg suitCfg = SuitCfgArray.Instance.GetCfg(201013);//羲和
|
|
|
+ //string resPath1 = ResPathUtil.GetDressUpAnimationPath(suitCfg.aniRes);
|
|
|
+ //SceneController.AddObjectToView(_gameObject4, _wrapper4, holder, resPath1, out _gameObject4, out _wrapper4);
|
|
|
|
|
|
SuitCfg suitCfg1 = SuitCfgArray.Instance.GetCfg(201006);//常曦
|
|
|
string resPath2 = ResPathUtil.GetDressUpAnimationPath(suitCfg1.aniRes);
|
|
@@ -356,6 +395,11 @@ namespace GFGGame
|
|
|
protected override void OnHide()
|
|
|
{
|
|
|
base.OnHide();
|
|
|
+ if (_sceneObject != null)
|
|
|
+ {
|
|
|
+ GameObject.Destroy(_sceneObject);
|
|
|
+ _sceneObject = null;
|
|
|
+ }
|
|
|
_valueBarController.OnHide();
|
|
|
|
|
|
Timers.inst.Remove(CheckTime);
|