Commit 8458b888 authored by mercury233's avatar mercury233 Committed by nanahira

add RMSshow_position3

parent 366d881f
Pipeline #14624 failed with stages
in 6 minutes and 20 seconds
......@@ -3801,6 +3801,10 @@ public class Ocgcore : ServantWithCardDescription
binaryMaster.writer.Write(positions);
sendReturn(binaryMaster.get());
}
if (positions == (0x1 | 0x4 | 0x8))
{
RMSshow_position3("return", code);
}
else
{
if ((positions & 0x1) > 0)
......
......@@ -126,6 +126,7 @@ public class Program : MonoBehaviour
public GameObject ES_multiple_option;
public GameObject ES_input;
public GameObject ES_position;
public GameObject ES_position3;
public GameObject ES_Tp;
public GameObject ES_Face;
public GameObject ES_FS;
......
......@@ -716,6 +716,40 @@ public class Servant
cardPicLoader_.code = (Int32.Parse(def.value) == (int)CardPosition.FaceDownDefence) ? 0 : code;
cardPicLoader_.uiTexture = UIHelper.getByName<UITexture>(currentMSwindow, "defPic_");
}
public void RMSshow_position3(string hashCode, int code)
{
RMSshow_clear();
currentMShash = hashCode;
currentMStype = messageSystemType.position;
currentMSwindow = create
(
Program.I().ES_position3,
MSentre(),
Vector3.zero,
true,
Program.ui_main_2d,
true,
new Vector3(((float)Screen.height) / 700f, ((float)Screen.height) / 700f, ((float)Screen.height) / 700f)
);
UIHelper.InterGameObject(currentMSwindow);
UIHelper.registEvent(currentMSwindow, "upAtk_", ES_RMSpremono, new messageSystemValue { value = "1", hint = "Face-Up Attack" });
UIHelper.registEvent(currentMSwindow, "upDef_", ES_RMSpremono, new messageSystemValue { value = "4", hint = "Face-Up Defense" });
UIHelper.registEvent(currentMSwindow, "downDef_", ES_RMSpremono, new messageSystemValue { value = "8", hint = "Face-Down Defense" });
UITexture upatkpic = UIHelper.getByName<UITexture>(currentMSwindow, "upAtkPic_");
UITexture updefpic = UIHelper.getByName<UITexture>(currentMSwindow, "upDefPic_");
UITexture downdefpic = UIHelper.getByName<UITexture>(currentMSwindow, "downDefPic_");
cardPicLoader cardPicLoader_ = currentMSwindow.AddComponent<cardPicLoader>();
cardPicLoader_.code = code;
cardPicLoader_.uiTexture = upatkpic;
cardPicLoader_ = currentMSwindow.AddComponent<cardPicLoader>();
cardPicLoader_.code = code;
cardPicLoader_.uiTexture = updefpic;
cardPicLoader_ = currentMSwindow.AddComponent<cardPicLoader>();
cardPicLoader_.code = 0;
cardPicLoader_.uiTexture = downdefpic;
}
public void RMSshow_tp(string hashCode, messageSystemValue jiandao, messageSystemValue shitou, messageSystemValue bu)
{
......
......@@ -181,7 +181,7 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_RotationOrder: 0
spreadCustomCurve:
serializedVersion: 2
m_Curve:
......@@ -205,7 +205,7 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_RotationOrder: 0
--- !u!4 &251477560
Transform:
m_ObjectHideFlags: 0
......@@ -765,6 +765,10 @@ Prefab:
propertyPath: mod_ocgcore_ss_link_mark
value:
objectReference: {fileID: 193842, guid: 31f237d5f58cc3d44b8c6f489981cdbe, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: ES_position3
value:
objectReference: {fileID: 197414, guid: fcbf44955a2f3ab4cbe011937cb34887, type: 2}
- target: {fileID: 11419100, guid: 995e2fa1a1156d248955c5fb98502585, type: 2}
propertyPath: new_ui_RoomList
value:
......
This diff is collapsed.
fileFormatVersion: 2
guid: fcbf44955a2f3ab4cbe011937cb34887
timeCreated: 1486983781
licenseType: Pro
NativeFormatImporter:
userData:
assetBundleName: 20170219
assetBundleVariant: 0201
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment