|
@@ -27,15 +27,44 @@ namespace GFGGame
|
|
|
private GameObject _gameObject0;
|
|
|
private GameObject _gameObject1;
|
|
|
private GameObject _gameObject2;
|
|
|
- private GameObject _gameObject3;
|
|
|
- private GameObject _gameObject4;
|
|
|
+ // private GameObject _gameObject3;
|
|
|
+ // private GameObject _gameObject4;
|
|
|
private GameObject _gameObject5;
|
|
|
private GameObject _gameObject6;
|
|
|
private GameObject _gameObject7;
|
|
|
private GameObject _gameObject8;
|
|
|
+ private GoWrapper _wrapper0;
|
|
|
+ private GoWrapper _wrapper1;
|
|
|
+ private GoWrapper _wrapper2;
|
|
|
+ private GoWrapper _wrapper5;
|
|
|
private GoWrapper _wrapper6;
|
|
|
private GoWrapper _wrapper7;
|
|
|
+ private GoWrapper _wrapper8;
|
|
|
|
|
|
+ public override void Dispose()
|
|
|
+ {
|
|
|
+ if (_sceneObject != null)
|
|
|
+ {
|
|
|
+ GameObject.Destroy(_sceneObject);
|
|
|
+ _sceneObject = null;
|
|
|
+ }
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject0, _wrapper0);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject1, _wrapper1);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject2, _wrapper2);
|
|
|
+ // SceneController.DestroyObjectFromView(_gameObject3);
|
|
|
+ // SceneController.DestroyObjectFromView(_gameObject4);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject5, _wrapper5);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject6, _wrapper6);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject7, _wrapper7);
|
|
|
+ SceneController.DestroyObjectFromView(_gameObject8, _wrapper8);
|
|
|
+ if (_ui != null)
|
|
|
+ {
|
|
|
+ _ui.Dispose();
|
|
|
+ _ui = null;
|
|
|
+ }
|
|
|
+ base.Dispose();
|
|
|
+
|
|
|
+ }
|
|
|
protected override void OnInit()
|
|
|
{
|
|
|
base.OnInit();
|
|
@@ -174,7 +203,7 @@ namespace GFGGame
|
|
|
// _ui.m_comClickCircle.m_t0.Stop(true, false);
|
|
|
_ui.m_comClickCircle.m_grpCircle.visible = false;
|
|
|
string resPath = ResPathUtil.GetViewEffectPath("ui_zhandou", paths[clickState]);
|
|
|
- SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath, out _gameObject2, out GoWrapper _wrapper2, 59);
|
|
|
+ SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath, out _gameObject2, out _wrapper2, 59);
|
|
|
_gameObject2.SetActive(true);
|
|
|
|
|
|
_ui.m_comClickCircle.m_ComScoreResult.m_c1.selectedIndex = clickState;
|
|
@@ -358,23 +387,23 @@ namespace GFGGame
|
|
|
private void AddEffect()
|
|
|
{
|
|
|
string resPath0 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_tw");
|
|
|
- SceneController.AddObjectToView(_gameObject0, null, _ui.m_holderPartScore, resPath0, out _gameObject0, out GoWrapper _wrapper0);
|
|
|
+ SceneController.AddObjectToView(_gameObject0, null, _ui.m_holderPartScore, resPath0, out _gameObject0, out _wrapper0);
|
|
|
string resPath1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt");
|
|
|
- SceneController.AddObjectToView(_gameObject1, null, _ui.m_proScore.m_comBar.m_holder, resPath1, out _gameObject1, out GoWrapper _wrapper1);
|
|
|
+ SceneController.AddObjectToView(_gameObject1, null, _ui.m_proScore.m_comBar.m_holder, resPath1, out _gameObject1, out _wrapper1);
|
|
|
string resPath2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_cheng");
|
|
|
- SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder1, resPath2, out _gameObject2, out GoWrapper _wrapper2, 59);
|
|
|
+ SceneController.AddObjectToView(_gameObject2, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder1, resPath2, out _gameObject2, out _wrapper2, 59);
|
|
|
// string resPath3_1 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_lv");
|
|
|
// SceneController.AddObjectToView(_gameObject3, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder, resPath3_1, out _gameObject3, out GoWrapper _wrapper3, 59);
|
|
|
// string resPath3_2 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_sb");
|
|
|
// SceneController.AddObjectToView(_gameObject4, null, _ui.m_comClickCircle.m_ComScoreResult.m_holder2, resPath3_2, out _gameObject4, out GoWrapper _wrapper4, 59);
|
|
|
string resPath4 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_jdt_cz");
|
|
|
- SceneController.AddObjectToView(_gameObject5, null, _ui.m_proScore.m_comBar.m_holder1, resPath4, out _gameObject5, out GoWrapper _wrapper5);
|
|
|
+ SceneController.AddObjectToView(_gameObject5, null, _ui.m_proScore.m_comBar.m_holder1, resPath4, out _gameObject5, out _wrapper5);
|
|
|
string resPath5 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_cz");
|
|
|
SceneController.AddObjectToView(_gameObject6, _wrapper6, _ui.m_comClickCircle.m_holder, resPath5, out _gameObject6, out _wrapper6);
|
|
|
string resPath6 = ResPathUtil.GetViewEffectPath("ui_zhandou", "ui_zd_an_sf");
|
|
|
SceneController.AddObjectToView(_gameObject7, _wrapper7, _ui.m_comClickCircle.m_holder1, resPath6, out _gameObject7, out _wrapper7);
|
|
|
string resPath7 = ResPathUtil.GetViewEffectPath("ui_zhandou", "zd_df_dfzj");
|
|
|
- SceneController.AddObjectToView(_gameObject8, null, _ui.m_comAllCircle.m_holder, resPath7, out _gameObject8, out GoWrapper _wrapper8, 70);
|
|
|
+ SceneController.AddObjectToView(_gameObject8, null, _ui.m_comAllCircle.m_holder, resPath7, out _gameObject8, out _wrapper8, 70);
|
|
|
}
|
|
|
protected override void OnHide()
|
|
|
{
|
|
@@ -394,29 +423,7 @@ namespace GFGGame
|
|
|
Timers.inst.Remove(CheckGuide);
|
|
|
}
|
|
|
|
|
|
- public override void Dispose()
|
|
|
- {
|
|
|
- if (_sceneObject != null)
|
|
|
- {
|
|
|
- GameObject.Destroy(_sceneObject);
|
|
|
- _sceneObject = null;
|
|
|
- }
|
|
|
- SceneController.DestroyObjectFromView(_gameObject0);
|
|
|
- SceneController.DestroyObjectFromView(_gameObject1);
|
|
|
- SceneController.DestroyObjectFromView(_gameObject2);
|
|
|
- SceneController.DestroyObjectFromView(_gameObject3);
|
|
|
- SceneController.DestroyObjectFromView(_gameObject4);
|
|
|
- SceneController.DestroyObjectFromView(_gameObject5);
|
|
|
- SceneController.DestroyObjectFromView(_gameObject6);
|
|
|
- SceneController.DestroyObjectFromView(_gameObject7);
|
|
|
- if (_ui != null)
|
|
|
- {
|
|
|
- _ui.Dispose();
|
|
|
- _ui = null;
|
|
|
- }
|
|
|
- base.Dispose();
|
|
|
|
|
|
- }
|
|
|
|
|
|
//********************************************************************************************************//
|
|
|
|