[03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC]

1. Turn off prince.
2. Fixed unable to show first portrait bug.
master
LH 6 years ago
parent 701c400847
commit b017f1a3a8
  1. 24
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator.unity
  2. 8
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/Assets/PaintingNavigator/Script/PaintingManager.cs
  3. 2
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Navigator_PC/19050-03_RoyalGallery_Navigator_PC/ProjectSettings/ProjectSettings.asset

@ -3453,7 +3453,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &673829346 --- !u!224 &673829346
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5265,16 +5265,16 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 621046121} m_TransformParent: {fileID: 621046121}
m_Modifications: m_Modifications:
- target: {fileID: 4765193242083809103, guid: eb773073a5b065b44b81ea4b2520c480,
type: 3}
propertyPath: loader
value:
objectReference: {fileID: 164669283}
- target: {fileID: 6457669733996986344, guid: eb773073a5b065b44b81ea4b2520c480, - target: {fileID: 6457669733996986344, guid: eb773073a5b065b44b81ea4b2520c480,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: 5x7 Layout Nav value: 5x7 Layout Nav
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4765193242083809103, guid: eb773073a5b065b44b81ea4b2520c480,
type: 3}
propertyPath: loader
value:
objectReference: {fileID: 164669283}
- target: {fileID: 6457669733996986345, guid: eb773073a5b065b44b81ea4b2520c480, - target: {fileID: 6457669733996986345, guid: eb773073a5b065b44b81ea4b2520c480,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -7106,7 +7106,7 @@ MonoBehaviour:
spacing: {x: 48, y: 30} spacing: {x: 48, y: 30}
scrollbars: [] scrollbars: []
printingManager: {fileID: 1305492452} printingManager: {fileID: 1305492452}
maxColumns: 200 maxColumns: 300
mode: 0 mode: 0
info: info:
--- !u!114 &1522636374 --- !u!114 &1522636374
@ -9774,16 +9774,16 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 71193839} m_TransformParent: {fileID: 71193839}
m_Modifications: m_Modifications:
- target: {fileID: 4765193242083809103, guid: eb773073a5b065b44b81ea4b2520c480,
type: 3}
propertyPath: loader
value:
objectReference: {fileID: 164669283}
- target: {fileID: 6457669733996986344, guid: eb773073a5b065b44b81ea4b2520c480, - target: {fileID: 6457669733996986344, guid: eb773073a5b065b44b81ea4b2520c480,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: 5x7 Layout Nav value: 5x7 Layout Nav
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4765193242083809103, guid: eb773073a5b065b44b81ea4b2520c480,
type: 3}
propertyPath: loader
value:
objectReference: {fileID: 164669283}
- target: {fileID: 6457669733996986345, guid: eb773073a5b065b44b81ea4b2520c480, - target: {fileID: 6457669733996986345, guid: eb773073a5b065b44b81ea4b2520c480,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x

@ -9,7 +9,7 @@ namespace UltraCombos.Frozen.RoyalGallery
public class PaintingManager : MonoBehaviour, IDragHandler public class PaintingManager : MonoBehaviour, IDragHandler
{ {
const int ROW = 3; const int ROW = 3;
const int COLUMN = 7; const int COLUMN = 9;
[SerializeField] [SerializeField]
Thumbnail template; Thumbnail template;
@ -141,7 +141,7 @@ namespace UltraCombos.Frozen.RoyalGallery
if (check_bound) if (check_bound)
{ {
var p = paintings.First.Value; var p = paintings.First.Value;
float limit_x = Screen.width * 0.5f + p.Size.x * 1.5f + spacing.x; float limit_x = Screen.width * 0.4f + p.Size.x * 1.5f + spacing.x;
if (p.Position.x < -limit_x) if (p.Position.x < -limit_x)
{ {
for (int i = 0; i < ROW; i++) for (int i = 0; i < ROW; i++)
@ -157,7 +157,7 @@ namespace UltraCombos.Frozen.RoyalGallery
if (check_bound) if (check_bound)
{ {
var p = paintings.Last.Value; var p = paintings.Last.Value;
float limit_x = Screen.width * 0.5f + p.Size.x * 2.5f + spacing.x; float limit_x = Screen.width * 0.4f + p.Size.x * 1.5f + spacing.x;
if (p.Position.x > limit_x) if (p.Position.x > limit_x)
{ {
var pos = (paintings.First.Value.transform as RectTransform).anchoredPosition; var pos = (paintings.First.Value.transform as RectTransform).anchoredPosition;
@ -182,7 +182,7 @@ namespace UltraCombos.Frozen.RoyalGallery
int valud_col = Mathf.Max(display_col, total_col - display_col); int valud_col = Mathf.Max(display_col, total_col - display_col);
float scroll_size = Mathf.Clamp01((float)display_col / valud_col); float scroll_size = Mathf.Clamp01((float)display_col / valud_col);
display_col = 6; display_col = COLUMN;
valud_col = Mathf.Max(display_col, total_col - display_col); valud_col = Mathf.Max(display_col, total_col - display_col);
if (anchoredPosition.x > min_anchor) if (anchoredPosition.x > min_anchor)
{ {

@ -118,7 +118,7 @@ PlayerSettings:
16:10: 1 16:10: 1
16:9: 1 16:9: 1
Others: 1 Others: 1
bundleVersion: 0.5 bundleVersion: 0.8
preloadedAssets: [] preloadedAssets: []
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0

Loading…
Cancel
Save