Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
| | |
| | |
|
| | | Transform _temp1 = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/JoyStick");
|
| | | _temp1.gameObject.SetActive(true);
|
| | |
|
| | | WindowCenter.Instance.Close<NewGuideWin>();
|
| | | }
|
| | | }
|
| | |
|
| | |
| | | if (taskinfo != null)
|
| | | {
|
| | | m_Text_Condition_1.text = taskinfo.show_writing;
|
| | | if (taskmodel._DicTaskInformation.ContainsKey(mainModel.TaskSkillID))
|
| | | {
|
| | | Dictionary<string, string> SkillDic = new Dictionary<string, string>();
|
| | | SkillDic = taskmodel._DicTaskInformation[mainModel.TaskSkillID];
|
| | | string strA = "on_kill_" + mainModel.TaskSkillID.ToString();
|
| | | string strB = "get_byid_" + mainModel.TaskSkillID.ToString();
|
| | | m_Text_Condition_1.SetReplaceInfo(SkillDic);
|
| | | }
|
| | | }
|
| | | if (mainModel.TaskId_Skill.Contains(mainModel.TaskSkillID))
|
| | | {
|