[03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad]

1. Added onClickEvent to trigger bgm.
2. Modified the time.
3. Removed trace code for debug.
4. Fixed coloring finish en text position.
master
LH 5 years ago
parent 49941f6116
commit 3fb8c1663c
  1. 6
      03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-2-Coloring.unity
  2. 2
      03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-3-Signature.unity
  3. 14
      03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/Main-6-SelectChar.unity
  4. 4
      03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/AppDataxConfiguration.cs
  5. 15
      03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/CharaManager.cs
  6. 11
      03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/PageManager.cs
  7. 12
      03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/ResourceClient.cs
  8. 4
      03_RoyalGallery/Unity-19050-03_RoyalGallery_iPad/19050-03_RoyalGallery_iPad/Assets/RoyalGallery/Script/Thumbnail.cs

@ -12553,7 +12553,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 17.4, y: 11.92} m_AnchoredPosition: {x: 48, y: 11.92}
m_SizeDelta: {x: 5, y: 40} m_SizeDelta: {x: 5, y: 40}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1066516032 --- !u!114 &1066516032
@ -12617,7 +12617,7 @@ MonoBehaviour:
fontSize: 64 fontSize: 64
lineSpacing: 1 lineSpacing: 1
baseline: 11.92 baseline: 11.92
baseX: 17.4 baseX: 48
- language: 40 - language: 40
text: "\u5B8C\u6210" text: "\u5B8C\u6210"
font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3} font: {fileID: 12800000, guid: 77255e05c7f15b444bf3a7669db71623, type: 3}
@ -14189,7 +14189,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 88495ef9abd10e74ba4e033996e763ec, type: 3} m_Script: {fileID: 11500000, guid: 88495ef9abd10e74ba4e033996e763ec, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
duration: 0 duration: 300
scenePath: Assets/Main-3-Signature.unity scenePath: Assets/Main-3-Signature.unity
onCountdown: onCountdown:
m_PersistentCalls: m_PersistentCalls:

@ -5446,7 +5446,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 88495ef9abd10e74ba4e033996e763ec, type: 3} m_Script: {fileID: 11500000, guid: 88495ef9abd10e74ba4e033996e763ec, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
duration: 0 duration: 300
scenePath: Assets/Main-5-Postcard.unity scenePath: Assets/Main-5-Postcard.unity
onCountdown: onCountdown:
m_PersistentCalls: m_PersistentCalls:

@ -1941,6 +1941,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cd08fa776da9fb4469c55590df708c16, type: 3} m_Script: {fileID: 11500000, guid: cd08fa776da9fb4469c55590df708c16, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
onClickEvent:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1099005198}
m_MethodName: PlayOneShot
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 &1380585848 --- !u!1 &1380585848
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

@ -30,8 +30,6 @@ namespace UltraCombos.Frozen.RoyalGallery
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
Trace();
AppData.Instance.deviceId = deviceId; AppData.Instance.deviceId = deviceId;
AppData.Instance.isEnablePaintBG = isEnablePaintBG; AppData.Instance.isEnablePaintBG = isEnablePaintBG;
AppData.Instance.isGetPageBySelf = isGetPageBySelf; AppData.Instance.isGetPageBySelf = isGetPageBySelf;
@ -42,8 +40,6 @@ namespace UltraCombos.Frozen.RoyalGallery
} }
UltraCombos.Multilingual.Core.Instance.isTaiwanNo1 = isTaiwanNo1; UltraCombos.Multilingual.Core.Instance.isTaiwanNo1 = isTaiwanNo1;
AppData.Instance.Trace("AppDataxConfiguration");
} }
// Update is called once per frame // Update is called once per frame

@ -78,7 +78,7 @@ namespace UltraCombos.Frozen.RoyalGallery
dialog.gameObject.SetActive(true); dialog.gameObject.SetActive(true);
dialog.chara = thumbnail; dialog.chara = thumbnail;
thumbnail.onClickEvent.Invoke();
/*printingManager.Prepare(thumbnail.artwork);*/ /*printingManager.Prepare(thumbnail.artwork);*/
}; };
@ -108,14 +108,19 @@ namespace UltraCombos.Frozen.RoyalGallery
else else
{ {
var pages = AppData.Instance.pages; var pages = AppData.Instance.pages;
if (pages.Count == 0)
if (pages != null)
{ {
foreach (var page in pages) var pm = FindObjectOfType<PageManager>();
if (pm != null)
{ {
mf_PrepareChara(page.Value); pm.LoadPage();
} }
} }
foreach (var page in pages)
{
mf_PrepareChara(page.Value);
}
} }
anchor = anchoredPosition.x; anchor = anchoredPosition.x;

@ -20,17 +20,24 @@ namespace UltraCombos.Frozen.RoyalGallery
public string FolderName = "Frozen"; public string FolderName = "Frozen";
private void Awake() private void Awake()
{
}
private void Start()
{ {
LoadPage(); LoadPage();
} }
private void LoadPage() public void LoadPage()
{ {
var pages = AppData.Instance.pages; var pages = AppData.Instance.pages;
foreach (var n in names) foreach (var n in names)
{ {
if (pages.ContainsKey(n)) if (pages.ContainsKey(n))
{
continue; continue;
}
string id = $"{n}"; string id = $"{n}";
//string name = $"Page-{id}"; //string name = $"Page-{id}";
@ -70,7 +77,7 @@ namespace UltraCombos.Frozen.RoyalGallery
} }
else else
{ {
Debug.Log($"<b>[Page Manager]</b> Page-{page} is not found."); Debug.Log($"<b>[Page Manager]</b> Page {page} is not found.");
} }
} }

@ -49,14 +49,12 @@ namespace UltraCombos.Frozen.RoyalGallery
public void GetPage() public void GetPage()
{ {
var data = AppData.Instance; var data = AppData.Instance;
data.Trace("ResourceClient::GetPage()");
Debug.Log($"data.isGetPageBySelf1 = {data.isGetPageBySelf}");
if (data.isGetPageBySelf) if (data.isGetPageBySelf)
{ {
GetPageBySelf(); GetPageBySelf();
return; return;
} }
Debug.Log($"data.isGetPageBySelf2 = {data.isGetPageBySelf}");
if (/*State != ChannelState.Ready ||*/ is_index_got) if (/*State != ChannelState.Ready ||*/ is_index_got)
return; return;
@ -65,7 +63,6 @@ namespace UltraCombos.Frozen.RoyalGallery
private async void GetPageAsync() private async void GetPageAsync()
{ {
Debug.Log("GetPageAsync()");
try try
{ {
var data = AppData.Instance; var data = AppData.Instance;
@ -88,28 +85,21 @@ namespace UltraCombos.Frozen.RoyalGallery
private void GetPageBySelf() private void GetPageBySelf()
{ {
Debug.Log("GetPageBySelf()");
PageManager pm = FindObjectOfType<PageManager>(); PageManager pm = FindObjectOfType<PageManager>();
if (!pm) if (!pm)
{ {
return; return;
} }
pm.Trace();
var data = AppData.Instance; var data = AppData.Instance;
data.currentIndex %= pm.names.Count; data.currentIndex %= pm.names.Count;
string name = pm.names[data.currentIndex++]; string name = pm.names[data.currentIndex++];
data.currentIndex %= pm.names.Count; data.currentIndex %= pm.names.Count;
Debug.Log($"GetPageBySelf() name = {name}");
data.roleId = name; data.roleId = name;
data.serial = Utils.GenerateSerial(0, data.roleId); data.serial = Utils.GenerateSerial(0, data.roleId);
data.color = new Color32(237, 244, 242, 255); data.color = new Color32(237, 244, 242, 255);
Debug.Log($"GetPageBySelf() data.roleId = {data.roleId}");
onPageReceived.Invoke(data.roleId); onPageReceived.Invoke(data.roleId);
} }

@ -5,6 +5,7 @@ using UnityEngine.UI;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.Events; using UnityEngine.Events;
using UltraCombos.Coloring; using UltraCombos.Coloring;
//using UnityEngine.Events;
namespace UltraCombos.Frozen.RoyalGallery namespace UltraCombos.Frozen.RoyalGallery
{ {
@ -17,6 +18,9 @@ namespace UltraCombos.Frozen.RoyalGallery
public delegate void ClickDelegate(); public delegate void ClickDelegate();
public ClickDelegate onClick; public ClickDelegate onClick;
[Space(10)]
public UnityEvent onClickEvent = new UnityEvent();
public Vector2 Size public Vector2 Size
{ {
get get

Loading…
Cancel
Save