show dummy DlgSubSkill
This commit is contained in:
@@ -16,7 +16,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &562642038236230410
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -170,7 +170,19 @@ MonoBehaviour:
|
||||
m_TargetGraphic: {fileID: 8890278808492480577}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Calls:
|
||||
- m_Target: {fileID: 3682957078725161371}
|
||||
m_TargetAssemblyTypeName: BrewMonster.UI.EmoteWindow, Assembly-CSharp
|
||||
m_MethodName: OnDragClick
|
||||
m_Mode: 1
|
||||
m_Arguments:
|
||||
m_ObjectArgument: {fileID: 0}
|
||||
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
|
||||
m_IntArgument: 0
|
||||
m_FloatArgument: 0
|
||||
m_StringArgument:
|
||||
m_BoolArgument: 0
|
||||
m_CallState: 2
|
||||
--- !u!1 &4678669480211337198
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -21,3 +21,5 @@ MonoBehaviour:
|
||||
prefab: {fileID: 903595479696773158, guid: cf26d96ae7d984ba8a5b6cef44adffeb, type: 3}
|
||||
- id: Win_Task
|
||||
prefab: {fileID: 6999114045547682248, guid: 8027cada0ef5e4a9f827001b4747174d, type: 3}
|
||||
- id: Win_SkillSubAction
|
||||
prefab: {fileID: 111271885693053298, guid: eb88919320b4229459c83b6b1f8f1e7b, type: 3}
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3c180e1658dbb5bd3b438f36770253ae8e04dff1d86b8b22e2bc279b683134d8
|
||||
size 10732
|
||||
oid sha256:305e74354eced472681f3a976c741e7e70d3ce8ba20714b215ac2e700299a956
|
||||
size 10892
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System.Collections.Generic;
|
||||
using BrewMonster;
|
||||
|
||||
namespace CSNetwork
|
||||
{
|
||||
@@ -61,6 +62,11 @@ namespace CSNetwork
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
ECMSG msg = Instance.m_MsgList.Dequeue();
|
||||
if (!Instance.m_MsgHandlerList.ContainsKey(msg.iManager))
|
||||
{
|
||||
BMLogger.LogError("Did not find handler ID: " + msg.iManager);
|
||||
continue;
|
||||
}
|
||||
Instance.m_tempHandler = Instance.m_MsgHandlerList[msg.iManager];
|
||||
if (Instance.m_tempHandler != null)
|
||||
{
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
using BrewMonster;
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
using System.Runtime.InteropServices;
|
||||
using BrewMonster.Scripts.Task.UI;
|
||||
using BrewMonster.Scripts.UI;
|
||||
using BrewMonster.UI;
|
||||
using CSNetwork.Common;
|
||||
using ModelRenderer.Scripts.Common;
|
||||
using PerfectWorld.Scripts.Task;
|
||||
using UnityEngine;
|
||||
@@ -16,8 +13,6 @@ namespace BrewMonster.Scripts.Task
|
||||
{
|
||||
public class TaskTest : MonoSingleton<TaskTest>
|
||||
{
|
||||
public GameObject m_pTaskDlg;
|
||||
public EmoteWindow emoteWindow;
|
||||
public static ATaskTemplMan m_pTaskMan; // use static to store loaded data across instances
|
||||
public bool WasLoadTaskData = false;
|
||||
|
||||
@@ -63,7 +58,15 @@ namespace BrewMonster.Scripts.Task
|
||||
}
|
||||
if (Input.GetKeyDown(KeyCode.E))
|
||||
{
|
||||
emoteWindow.Show(!emoteWindow.gameObject.activeInHierarchy);
|
||||
var dlg = CECUIManager.Instance.GetInGameUIMan().GetDialog("Win_SkillSubAction");
|
||||
if (dlg && !dlg.gameObject.activeInHierarchy)
|
||||
{
|
||||
dlg.Show(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
dlg.Show(false);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ namespace BrewMonster.UI
|
||||
// {
|
||||
// if (bInAutoMode) return;
|
||||
//todo: dummy call StartGame
|
||||
EC_Game.GetGameRun().StartGame(0, Vector3.zero);
|
||||
// EC_Game.GetGameRun().StartGame(0, Vector3.zero);
|
||||
CECShortcut pSC = EC_Game.GetGameRun().GetPoseCmdShortcuts().GetShortcut(slot);
|
||||
// if (CDlgAutoHelp::IsAutoHelp() && strstr(pDlgSrc->GetName(), "Win_Quickbar"))
|
||||
// {
|
||||
|
||||
@@ -63,6 +63,7 @@ public partial class CECGameRun
|
||||
//}
|
||||
m_InstTab.Add(161, new CECInstance());
|
||||
AddressableManager.Instance.OnDispose += Dispose;
|
||||
StartGame(0, Vector3.zero);
|
||||
}
|
||||
|
||||
private static void Dispose()
|
||||
|
||||
Reference in New Issue
Block a user