最新制作修改后提交
This commit is contained in:
parent
9e12714ca9
commit
5cecbe8693
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e6b6bd320ff1d1545bcd3b45ddfec05d
|
||||
guid: bbe8c82464f845b4ea08201be0040a23
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b3f158474e83e3942b0a6448478e8749
|
||||
guid: bb80546d0e11d794cb2b49d89ff3f6cc
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6664176622d69774ebc0627deda7d75a
|
||||
guid: 21b1ef0ebc17b954586f7b1bafe1109b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8b3ef47b258f7b743b7d30fc2b159b36
|
||||
guid: 6ad5082e091ab1941a74c78d42feec05
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 581b197129b5e2c4bb12edac811a4ea1
|
||||
guid: 84e050e4a67a2f74eb7200d8e2c740c9
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: af9a84c5f123b7643bfc35723b1b4d07
|
||||
guid: 6a19ee9ef39ed5942b3043f92b1dea9b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 23608eec39a5d22408866b486b37ee56
|
||||
guid: 21838237f1098f7488095d01524bd140
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b30b44d2d06d6cb41bc268e2a53b57d7
|
||||
guid: 260892d36ec445c4eb86b7769b06424c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2dc56f7109c2ffb4e8b3d7fdf4b12057
|
||||
guid: d36326088d748b046ae6cf184d37a565
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4ce87cf593d979e4bb736913be8e1994
|
||||
guid: c233440dc5cd9064eb21303e38573158
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: cb4ecb8cb66c0da4ea58563219698054
|
||||
guid: 24cfde41472581143b3de383bf944296
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 42f250b539e906547be539865975250e
|
||||
guid: 2a6db3a3a93fa13429659d8a41e235c9
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9fe07864152094b46ad92ad690c2b703
|
||||
guid: 82611ab085fa5024aaf70f78b24656bc
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ec7e94b3ca0eeea488620dec92426a7c
|
||||
guid: e54a4bcaabb88dc47a38016702824b49
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 70fa6f420b5178b47a12894453247ead
|
||||
guid: 48786099828b6e24a994dd5a36a1f81f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2bac48968291d424498be45e7eeb6ada
|
||||
guid: 803a2d54868669a44985cac55c9904db
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4fb74052ead70ab4bb50f2b7f35f5023
|
||||
guid: aa5b5aaaedf81094a8069209c01dee15
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c68a4f90b9644014c901129b225767ba
|
||||
guid: 4b538bee112f011479004eb345213fcf
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 982407491439ce94196fc0dd8991f470
|
||||
guid: c8cf554d9e084244ba349919c8a44d57
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
@ -320,23 +320,47 @@ namespace DongWuYiXue.DaoNiaoShu
|
||||
//}
|
||||
};
|
||||
}
|
||||
public void ShowDragQuestion(int id, int score, int scoreId, Action nextFun)
|
||||
//public void ShowDragQuestion(int id, int score, int scoreId, Action nextFun)
|
||||
//{
|
||||
// DragQuestionPanel dragQuestionPanel = GameManager.Instance.uiManager.GetUI<DragQuestionPanel>();
|
||||
// dragQuestionPanel.ShowDragQuestion(id);
|
||||
// dragQuestionPanel.nextAction = nextFun;
|
||||
// dragQuestionPanel.subAction = (a, b) =>
|
||||
// {
|
||||
// if (a)
|
||||
// {
|
||||
// AddScore(score, scoreId);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// AddScore(0, scoreId);
|
||||
// }
|
||||
// };
|
||||
//}
|
||||
|
||||
public void ShowDragQuestion(string stepName, int id, int scoreId, int score, Action nextFun)
|
||||
{
|
||||
DragQuestionPanel dragQuestionPanel = GameManager.Instance.uiManager.GetUI<DragQuestionPanel>();
|
||||
dragQuestionPanel.ShowDragQuestion(id);
|
||||
dragQuestionPanel.ShowDragQuestion(id, stepName);
|
||||
dragQuestionPanel.nextAction = nextFun;
|
||||
dragQuestionPanel.subAction = (a, b) =>
|
||||
{
|
||||
if (a)
|
||||
dragQuestionPanel.subAction = isTrue => {
|
||||
if (isTrue)
|
||||
{
|
||||
AddScore(score, scoreId);
|
||||
GameManager.Instance.kaoheManager.AddScore(score, scoreId, (s, t) =>
|
||||
{
|
||||
GameManager.Instance.uiManager.GetUI<ScorePanel>().SetScore(s.ToString(), t.ToString());
|
||||
});
|
||||
}
|
||||
else
|
||||
{
|
||||
AddScore(0, scoreId);
|
||||
GameManager.Instance.kaoheManager.AddScore(0, scoreId, (s, t) =>
|
||||
{
|
||||
GameManager.Instance.uiManager.GetUI<ScorePanel>().SetScore(s.ToString(), t.ToString());
|
||||
});
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
public void ShowLineQuestion(int id, int score, int scoreId, Action nextFun)
|
||||
{
|
||||
LineQuestionPanel lineQuestionPanel = GameManager.Instance.uiManager.GetUI<LineQuestionPanel>();
|
||||
|
||||
@ -23,6 +23,7 @@ namespace DongWuYiXue.DaoNiaoShu
|
||||
fsm.ShowSpeakPanel("操作后处理》操作后嘱咐", "先生，您好。已经将患宠膀胱内潴留的尿液通过导尿管已经引流出来了，下一步需要查找导致急性尿潴留的病因，然后再对因治疗",
|
||||
new Vector3(210f, 40f), 2, 0, 5, c =>
|
||||
{
|
||||
GameManager.Instance.uiManager.CloseUI<SpeakPanel>();
|
||||
//fsm.PlayClip("操作后嘱咐_TimeLine", () =>
|
||||
//{
|
||||
Game.Instance.sound.StopBGM();
|
||||
|
||||
@ -11,14 +11,14 @@ namespace DongWuYiXue.DaoNiaoShu
|
||||
fsm.ShowCamera("WuPinZhunBei_Camera");
|
||||
if (fsm.main_gameModel.modeType == ModeType.ShiXun)
|
||||
{
|
||||
fsm.ShowDragQuestion(1, 3, 0, () =>
|
||||
fsm.ShowDragQuestion("操作前准备》戴无菌手套", 1, 0, 3, () =>
|
||||
{
|
||||
fsm.nextState = true;
|
||||
});
|
||||
}
|
||||
if (fsm.main_gameModel.modeType == ModeType.KaoHe)
|
||||
{
|
||||
fsm.ShowDragQuestion(1, 3, 0, () =>
|
||||
fsm.ShowDragQuestion("操作前准备》戴无菌手套", 1, 0, 3, () =>
|
||||
{
|
||||
fsm.nextState = true;
|
||||
});
|
||||
|
||||
@ -11,14 +11,14 @@ namespace DongWuYiXue.DaoNiaoShu
|
||||
fsm.ShowCamera("WuPinZhunBei_Camera");
|
||||
if (fsm.main_gameModel.modeType == ModeType.ShiXun)
|
||||
{
|
||||
fsm.ShowDragQuestion(0, 2, 0, () =>
|
||||
fsm.ShowDragQuestion("操作后处理》医生洗手",0, 0, 2, () =>
|
||||
{
|
||||
fsm.nextState = true;
|
||||
});
|
||||
}
|
||||
if (fsm.main_gameModel.modeType == ModeType.KaoHe)
|
||||
{
|
||||
fsm.ShowDragQuestion(0, 2, 0, () =>
|
||||
fsm.ShowDragQuestion("操作后处理》医生洗手",0, 0, 2, () =>
|
||||
{
|
||||
fsm.nextState = true;
|
||||
});
|
||||
|
||||
@ -11,14 +11,14 @@ namespace DongWuYiXue.DaoNiaoShu
|
||||
fsm.ShowCamera("WuPinZhunBei_Camera");
|
||||
if (fsm.main_gameModel.modeType == ModeType.ShiXun)
|
||||
{
|
||||
fsm.ShowDragQuestion(0, 5, 0, () =>
|
||||
fsm.ShowDragQuestion("操作前准备》医生准备",0, 0, 5, () =>
|
||||
{
|
||||
fsm.nextState = true;
|
||||
});
|
||||
}
|
||||
if (fsm.main_gameModel.modeType == ModeType.KaoHe)
|
||||
{
|
||||
fsm.ShowDragQuestion(0, 5, 0, () =>
|
||||
fsm.ShowDragQuestion("操作前准备》医生准备",0, 0, 5, () =>
|
||||
{
|
||||
fsm.nextState = true;
|
||||
});
|
||||
|
||||
@ -9,12 +9,13 @@ namespace DongWuYiXue.DaoNiaoShu
|
||||
public override string Name => "DragQuestionPanel";
|
||||
|
||||
public Action nextAction;
|
||||
public Action<bool,int> subAction;
|
||||
public Action<bool> subAction;
|
||||
DragManager[] drags;
|
||||
Button nextBtn;
|
||||
Button subBtn;
|
||||
Button resetBtn;
|
||||
int id;
|
||||
string stepName;
|
||||
public override void Init(IUIManager uictrl)
|
||||
{
|
||||
base.Init(uictrl);
|
||||
@ -28,28 +29,33 @@ namespace DongWuYiXue.DaoNiaoShu
|
||||
}
|
||||
private void Submit()
|
||||
{
|
||||
Game.Instance.sound.StopBGM();
|
||||
if (drags[id].CheckAllDrag())
|
||||
{
|
||||
subAction?.Invoke(true, id);
|
||||
subAction?.Invoke(true);
|
||||
nextBtn.gameObject.SetActive(true);
|
||||
Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = true });
|
||||
}
|
||||
else
|
||||
{
|
||||
subAction?.Invoke(false, id);
|
||||
nextBtn.gameObject.SetActive(true);
|
||||
Game.Instance.eventManager.Raise(new PlayTrueOrFalseEvent() { isTrue = false });
|
||||
if (MVC.GetModel<Main.GameModel>().modeType == ModeType.ShiXun)
|
||||
{
|
||||
ChatUI.Instance.SendAI(stepName + ",用户的答案为" + drags[id].GetYourAnswer() + "，请对用户的答案做解析，并介绍本步骤的答案和意义,字数控制在120字内。", null);
|
||||
}
|
||||
else
|
||||
{
|
||||
subAction?.Invoke(false);
|
||||
}
|
||||
}
|
||||
drags[id].DisPlayResult();
|
||||
subBtn.interactable = false;
|
||||
resetBtn.interactable= false;
|
||||
nextBtn.gameObject.SetActive(true);
|
||||
}
|
||||
public override void Hide()
|
||||
{
|
||||
base.Hide();
|
||||
subBtn.interactable = true;
|
||||
resetBtn.interactable = true;
|
||||
nextBtn.gameObject.SetActive(false);
|
||||
resetBtn.interactable = false;
|
||||
}
|
||||
private void Next()
|
||||
{
|
||||
ChatUI.Instance.CloseChatTxt();
|
||||
SetActive(false);
|
||||
subBtn.interactable = true;
|
||||
resetBtn.interactable = true;
|
||||
@ -60,13 +66,17 @@ namespace DongWuYiXue.DaoNiaoShu
|
||||
{
|
||||
drags[id].Init();
|
||||
}
|
||||
public void ShowDragQuestion(int id)
|
||||
public void ShowDragQuestion(int id, string stepName)
|
||||
{
|
||||
SetActive(true);
|
||||
this.stepName = stepName;
|
||||
subBtn.interactable = true;
|
||||
resetBtn.interactable = true;
|
||||
nextBtn.gameObject.SetActive(false);
|
||||
this.id = id;
|
||||
for (int i = 0; i < drags.Length; i++)
|
||||
{
|
||||
if(i == id)
|
||||
if (i == id)
|
||||
{
|
||||
drags[i].gameObject.SetActive(true);
|
||||
drags[i].Init();
|
||||
|
||||
7
log/ivw.log
Normal file
7
log/ivw.log
Normal file
@ -0,0 +1,7 @@
|
||||
Log file created at: 2025/09/25 09:32:11
|
||||
Running on machine: ADMIN
|
||||
Log line format: [IWEF]mmdd hh:mm:ss.mmm threadid: msg
|
||||
E0925 09:32:11.709 15412:Res_mgr::Res_delete | res still been used, refCount = 1 resId = 119 resType = IVW_KEYWORD
|
||||
E0925 09:32:11.710 15412:Error: ret= 60010
|
||||
E0925 09:32:11.710 15412:IvwInterfaceImp::wIvwResourceDelete | ResType = IVW_KEYWORD, ResID = 119, ret = 60010
|
||||
E0925 09:32:11.710 15412:Error: ret= 60010
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user