From a9888da251d3ce142dc98c6e9ab519ef37007250 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 11 四月 2019 17:00:54 +0800
Subject: [PATCH] 6481 【前端】【2.0】创角修改

---
 System/Login/SelectRoleWin.cs |   82 ++++++++++++++++++++++-------------------
 1 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/System/Login/SelectRoleWin.cs b/System/Login/SelectRoleWin.cs
index d4dd06a..3fd99a0 100644
--- a/System/Login/SelectRoleWin.cs
+++ b/System/Login/SelectRoleWin.cs
@@ -6,22 +6,32 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-
 using UnityEngine;
 using UnityEngine.UI;
+
 namespace Snxxz.UI
 {
 
     public class SelectRoleWin : Window
     {
-        [SerializeField] Text nameText;
-        [SerializeField] Text lvText;
+        [SerializeField] Text m_PlayerName;
+        [SerializeField] Text m_PlayerLevel;
 
-        [SerializeField] Button beginBtn;
-        [SerializeField] Image playerIcon;
-        [SerializeField] Button backBtn;
+        [SerializeField] Button m_Begin;
+        [SerializeField] Image m_Description;
+        [SerializeField] Button m_Back;
 
-        CreateRoleHeroShow m_CreateRoleShow;
+        SelectRoleProcessor m_SelectRoleProcessor;
+        SelectRoleProcessor selectRoleProcessor {
+            get {
+                if (m_SelectRoleProcessor == null)
+                {
+                    m_SelectRoleProcessor = GameObject.FindObjectOfType<SelectRoleProcessor>();
+                }
+
+                return m_SelectRoleProcessor;
+            }
+        }
 
         LoginModel model { get { return ModelCenter.Instance.GetModel<LoginModel>(); } }
 
@@ -32,8 +42,8 @@
 
         protected override void AddListeners()
         {
-            beginBtn.onClick.AddListener(BeginBtn);
-            backBtn.onClick.AddListener(BackToLogin);
+            m_Begin.onClick.AddListener(BeginBtn);
+            m_Back.onClick.AddListener(BackToLogin);
         }
 
         private void BackToLogin()
@@ -43,8 +53,6 @@
 
         protected override void OnPreOpen()
         {
-            m_CreateRoleShow = GameObject.FindObjectOfType<CreateRoleHeroShow>();
-
             InitInfo();
         }
 
@@ -58,35 +66,31 @@
 
         protected override void OnAfterClose()
         {
-            RemoveRoleModel();
+            selectRoleProcessor.Dispose();
         }
         #endregion
 
-        private void RemoveRoleModel()
-        {
-            m_CreateRoleShow.Dispose();
-        }
-
         private void BeginBtn()
         {
-            if (GameNetSystem.Instance.netState != GameNetSystem.NetState.Connected)
+            if (GameNetSystem.Instance.netState == GameNetSystem.NetState.Connected)
             {
-                if (Application.internetReachability == NetworkReachability.NotReachable)
-                {
-                    ConfirmCancel.ShowPopConfirm(
-                        Language.Get("Mail101"),
-                        Language.Get("L1116"),
-                        () => { }
-                        );
-                    NetLinkWin.Hide();
-                }
-                else
-                {
-                    LoadingWin.targetMapResId =2;
-                    WindowCenter.Instance.Open<LoadingWin>();
-                    model.EnterWorld(2);
-                }
+                return;
             }
+
+            if (Application.internetReachability == NetworkReachability.NotReachable)
+            {
+                ConfirmCancel.ShowPopConfirm(
+                    Language.Get("Mail101"),
+                    Language.Get("L1116")
+                    );
+
+                NetLinkWin.Hide();
+                return;
+            }
+
+            LoadingWin.targetMapResId = 2;
+            WindowCenter.Instance.Open<LoadingWin>();
+            model.EnterWorld(2);
         }
 
         private void InitInfo()
@@ -95,11 +99,13 @@
             {
                 return;
             }
-            nameText.text = PlayerDatas.Instance.loginInfo.PlayerName.ToString();//鐜╁鏄电О
-            lvText.text = Language.Get("Z1024", PlayerDatas.Instance.loginInfo.LV);//鐜╁绛夌骇
-            CreateRoleConfig _cfg = CreateRoleConfig.Get(PlayerDatas.Instance.loginInfo.Job);
-            playerIcon.SetSprite(_cfg.desc);
-            m_CreateRoleShow.SelectRoleShow();
+
+            m_PlayerName.text = PlayerDatas.Instance.loginInfo.PlayerName.ToString();//鐜╁鏄电О
+            m_PlayerLevel.text = Language.Get("Z1024", PlayerDatas.Instance.loginInfo.LV);//鐜╁绛夌骇
+            var config = CreateRoleConfig.Get(PlayerDatas.Instance.loginInfo.Job);
+            m_Description.SetSprite(config.desc);
+
+            selectRoleProcessor.Show(PlayerDatas.Instance.loginInfo.Job);
         }
 
     }

--
Gitblit v1.8.0