[03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC]

1. Added signature.
2. Hide cursor.
3. Fixed id problem.
4. Turn off TransitionEffect.
master
LH 6 years ago
parent a8f6feb55f
commit 701c400847
  1. 599
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait.unity
  2. 32
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/Portrait.cs
  3. 8
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/PortraitManager.cs
  4. 37
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Script/RorayGalleryGrpcServer.cs
  5. 2
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/Assets/RoyalGalleryPortrait/Shader/TransitionEffectShader.shader
  6. 2
      03_RoyalGallery/Unity-19050-03_RoyalGallery_Portrait_PC/19050-03_RoyalGallery_Portrait_PC/ProjectSettings/ProjectSettings.asset

@ -112,6 +112,146 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1 &32945671
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 32945672}
- component: {fileID: 32945674}
- component: {fileID: 32945673}
m_Layer: 0
m_Name: signature
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &32945672
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 32945671}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 244257791}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 275.10043, y: -742.00006}
m_SizeDelta: {x: 378.25, y: 156.25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &32945673
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 32945671}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: 967a8cc9660230641a23f275822f05fd, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &32945674
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 32945671}
m_CullTransparentMesh: 0
--- !u!1 &46727606
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 46727607}
- component: {fileID: 46727609}
- component: {fileID: 46727608}
m_Layer: 0
m_Name: signature
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &46727607
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 46727606}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 937425704}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 267, y: -714.9999}
m_SizeDelta: {x: 378.25, y: 156.25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &46727608
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 46727606}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: 967a8cc9660230641a23f275822f05fd, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &46727609
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 46727606}
m_CullTransparentMesh: 0
--- !u!1 &66073406 --- !u!1 &66073406
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -552,7 +692,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 32945672}
m_Father: {fileID: 1629680761} m_Father: {fileID: 1629680761}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -827,6 +968,76 @@ MonoBehaviour:
isDelay: 0 isDelay: 0
delayTime: -1 delayTime: -1
path: 20181126_MinionsSZ_GirlsRoom_Ani_18.aif path: 20181126_MinionsSZ_GirlsRoom_Ani_18.aif
--- !u!1 &368298993
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 368298994}
- component: {fileID: 368298996}
- component: {fileID: 368298995}
m_Layer: 0
m_Name: signature
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &368298994
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 368298993}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 374925486}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 267, y: -752}
m_SizeDelta: {x: 378.25, y: 156.25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &368298995
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 368298993}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: 967a8cc9660230641a23f275822f05fd, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &368298996
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 368298993}
m_CullTransparentMesh: 0
--- !u!1 &374925485 --- !u!1 &374925485
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -856,7 +1067,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 368298994}
m_Father: {fileID: 1095845117} m_Father: {fileID: 1095845117}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -1248,6 +1460,76 @@ MeshFilter:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 417831287} m_GameObject: {fileID: 417831287}
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &485049319
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 485049320}
- component: {fileID: 485049322}
- component: {fileID: 485049321}
m_Layer: 0
m_Name: signature
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &485049320
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 485049319}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1182070070}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 192.70003, y: -780.4006}
m_SizeDelta: {x: 378.25, y: 156.25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &485049321
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 485049319}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: 967a8cc9660230641a23f275822f05fd, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &485049322
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 485049319}
m_CullTransparentMesh: 0
--- !u!1 &532974843 --- !u!1 &532974843
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2237,7 +2519,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 1676615724}
m_Father: {fileID: 1953387458} m_Father: {fileID: 1953387458}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2579,7 +2862,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 841726152} m_GameObject: {fileID: 841726152}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e7ebb928551598b458017c1d9ba3863f, type: 3} m_Script: {fileID: 11500000, guid: e7ebb928551598b458017c1d9ba3863f, type: 3}
m_Name: m_Name:
@ -2672,6 +2955,76 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: e1f97271624dbd74088db35fef864c0b, type: 3} m_Script: {fileID: 11500000, guid: e1f97271624dbd74088db35fef864c0b, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &894198874
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 894198875}
- component: {fileID: 894198877}
- component: {fileID: 894198876}
m_Layer: 0
m_Name: signature
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &894198875
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 894198874}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1162992622}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 267, y: -752}
m_SizeDelta: {x: 378.25, y: 156.25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &894198876
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 894198874}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: 967a8cc9660230641a23f275822f05fd, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &894198877
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 894198874}
m_CullTransparentMesh: 0
--- !u!1 &937425703 --- !u!1 &937425703
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -2701,7 +3054,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 46727607}
m_Father: {fileID: 78634571} m_Father: {fileID: 78634571}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2931,7 +3285,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 961139953} m_GameObject: {fileID: 961139953}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3} m_Script: {fileID: 11500000, guid: 10f07b3f9fb96524db93eb42d89c229c, type: 3}
m_Name: m_Name:
@ -2986,8 +3340,9 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
port: 50051 port: 50051
subnet: 192.168.234.0 subnet: 192.168.60.0
texture: {fileID: 0} texture: {fileID: 0}
tex_sign: {fileID: 0}
m_IdList: [] m_IdList: []
onTextureReceived: onTextureReceived:
m_PersistentCalls: m_PersistentCalls:
@ -3029,7 +3384,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 204478da94f5ba34fb542adc9bffbc6d, type: 3} m_Script: {fileID: 11500000, guid: 204478da94f5ba34fb542adc9bffbc6d, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
host: localhost host: 192.168.60.220
port: 50052 port: 50052
onStateChanged: onStateChanged:
m_PersistentCalls: m_PersistentCalls:
@ -3181,6 +3536,76 @@ Camera:
m_OcclusionCulling: 1 m_OcclusionCulling: 1
m_StereoConvergence: 10 m_StereoConvergence: 10
m_StereoSeparation: 0.022 m_StereoSeparation: 0.022
--- !u!1 &1013046073
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1013046074}
- component: {fileID: 1013046076}
- component: {fileID: 1013046075}
m_Layer: 0
m_Name: signature
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1013046074
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1013046073}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1599279131}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 291.00024, y: -752}
m_SizeDelta: {x: 378.25, y: 156.25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1013046075
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1013046073}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: 967a8cc9660230641a23f275822f05fd, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &1013046076
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1013046073}
m_CullTransparentMesh: 0
--- !u!1 &1055363693 --- !u!1 &1055363693
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3549,7 +3974,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 894198875}
m_Father: {fileID: 246768082} m_Father: {fileID: 246768082}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3640,7 +4066,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 485049320}
m_Father: {fileID: 891482388} m_Father: {fileID: 891482388}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3718,7 +4145,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!114 &1215315276 --- !u!114 &1215315276
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -3726,7 +4153,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1215315275} m_GameObject: {fileID: 1215315275}
m_Enabled: 1 m_Enabled: 0
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45099d624c1e6c14e9514f4e5ea1ed9c, type: 3} m_Script: {fileID: 11500000, guid: 45099d624c1e6c14e9514f4e5ea1ed9c, type: 3}
m_Name: m_Name:
@ -3922,6 +4349,76 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1259440794} m_GameObject: {fileID: 1259440794}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &1286563122
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1286563123}
- component: {fileID: 1286563125}
- component: {fileID: 1286563124}
m_Layer: 0
m_Name: signature
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1286563123
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1286563122}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1502836841}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 280.99997, y: -752}
m_SizeDelta: {x: 378.25, y: 156.25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1286563124
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1286563122}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: 967a8cc9660230641a23f275822f05fd, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &1286563125
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1286563122}
m_CullTransparentMesh: 0
--- !u!1 &1337158412 --- !u!1 &1337158412
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -4502,7 +4999,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 1286563123}
m_Father: {fileID: 2092843638} m_Father: {fileID: 2092843638}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5246,7 +5744,8 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children:
- {fileID: 1013046074}
m_Father: {fileID: 1821221164} m_Father: {fileID: 1821221164}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -5670,7 +6169,7 @@ MonoBehaviour:
height: 1920 height: 1920
fps: 60 fps: 60
mode: 1 mode: 1
cursor: 1 cursor: 0
--- !u!4 &1672874512 --- !u!4 &1672874512
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5685,6 +6184,76 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1676615723
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1676615724}
- component: {fileID: 1676615726}
- component: {fileID: 1676615725}
m_Layer: 0
m_Name: signature
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1676615724
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1676615723}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 820506441}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 247.9999, y: -754.99994}
m_SizeDelta: {x: 378.25, y: 156.25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1676615725
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1676615723}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Texture: {fileID: 2800000, guid: 967a8cc9660230641a23f275822f05fd, type: 3}
m_UVRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
--- !u!222 &1676615726
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1676615723}
m_CullTransparentMesh: 0
--- !u!1 &1686406205 --- !u!1 &1686406205
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

@ -19,8 +19,9 @@ namespace UltraCombos.Frozen
//RendererPropertyOverride prop; //RendererPropertyOverride prop;
RawImage image; RawImage image;
RawImage image_sign;
Texture2D tex; Texture2D tex;
Texture2D tex_sign;
Texture blank_texture; Texture blank_texture;
Animator animator = null; Animator animator = null;
@ -51,6 +52,9 @@ namespace UltraCombos.Frozen
image = GetComponent<RawImage>(); image = GetComponent<RawImage>();
blank_texture = image.texture; blank_texture = image.texture;
image_sign = GetComponentsInChildren<RawImage>()[1];
image_sign.color = new Color32(0, 0, 0, 0);
/* /*
animator = GetComponent<Animator>(); animator = GetComponent<Animator>();
if (animator) if (animator)
@ -86,12 +90,14 @@ namespace UltraCombos.Frozen
} }
} }
public void UpdateTexture(Texture2D texture) public void UpdateTexture(Texture2D texture, Texture2D texture_sign)
{ {
OnTrigger(); OnTrigger();
if (texture == null) if (texture == null)
{
return; return;
}
if (tex == null) if (tex == null)
{ {
@ -108,6 +114,28 @@ namespace UltraCombos.Frozen
tex.Apply(); tex.Apply();
image.texture = tex; image.texture = tex;
if (texture_sign == null)
{
return;
}
if (tex_sign == null)
{
tex_sign = new Texture2D(texture_sign.width, texture_sign.height, texture_sign.format, true);
}
if (tex_sign.width != texture_sign.width || tex_sign.height != texture_sign.height)
{
tex_sign.Resize(texture_sign.width, texture_sign.height);
tex_sign.Apply();
}
tex_sign.SetPixels(texture_sign.GetPixels());
tex_sign.Apply();
image_sign.texture = tex_sign;
image_sign.color = new Color32(255, 255, 255, 255);
} }
public void OnPlay() public void OnPlay()

@ -112,17 +112,17 @@ namespace UltraCombos.Frozen.RoyalGallery
if (mode) if (mode)
{ {
mode = false; mode = false;
UpdateTexture(id, null); UpdateTexture(id, null, null);
//index = (index + 1) % portraits.Count; //index = (index + 1) % portraits.Count;
} }
} }
public void UpdateTexture(string id, Texture2D texture) public void UpdateTexture(string id, Texture2D texture, Texture2D tex_sign)
{ {
if (portraits.ContainsKey(id)) if (portraits.ContainsKey(id))
{ {
var painting = portraits[id]; var painting = portraits[id];
painting.UpdateTexture(texture); painting.UpdateTexture(texture, tex_sign);
onPaintingUpdated.Invoke(painting.transform.position); onPaintingUpdated.Invoke(painting.transform.position);
quePortraitKeyNxt.Enqueue(id); quePortraitKeyNxt.Enqueue(id);
@ -159,6 +159,7 @@ namespace UltraCombos.Frozen.RoyalGallery
IEnumerator UpdateTransition(string next, TransitionScript transition) IEnumerator UpdateTransition(string next, TransitionScript transition)
{ {
/*
transition.OnPlay(); transition.OnPlay();
while (true) while (true)
@ -172,6 +173,7 @@ namespace UltraCombos.Frozen.RoyalGallery
} }
transition.OnStop(); transition.OnStop();
*/
string PortraitKeyPre = PortraitKeyCur; string PortraitKeyPre = PortraitKeyCur;
PortraitKeyCur = next; PortraitKeyCur = next;

@ -18,18 +18,19 @@ namespace UltraCombos.Frozen.RoyalGallery
{ {
public string subnet = "192.168.234.0"; public string subnet = "192.168.234.0";
public Texture2D texture; public Texture2D texture;
public Texture2D tex_sign;
object data_mtx = new object(); object data_mtx = new object();
Queue<DataRequest> data_pool; Queue<DataRequest> data_pool;
int index = 0; int index = 0;
object idx_mtx = new object(); object idx_mtx = new object();
int maxCount = 10; //int maxCount = 10;
public List<string> m_IdList = new List<string>(); public List<string> m_IdList = new List<string>();
[System.Serializable] [System.Serializable]
public class TextureEvent : UnityEvent<string, Texture2D> { } public class TextureEvent : UnityEvent<string, Texture2D, Texture2D> { }
[Space(10)] [Space(10)]
public TextureEvent onTextureReceived = new TextureEvent(); public TextureEvent onTextureReceived = new TextureEvent();
@ -55,6 +56,14 @@ namespace UltraCombos.Frozen.RoyalGallery
{ {
m_IdList.Add(list[i].id); m_IdList.Add(list[i].id);
} }
m_IdList.Sort();
PortraitManager manager = FindObjectOfType<PortraitManager>();
if (manager != null)
{
index = manager.PortaitInitIndex;
}
#else #else
/* /*
PaintingSprite[] _paintingSpriteList = FindObjectsOfType<PaintingSprite>(); PaintingSprite[] _paintingSpriteList = FindObjectsOfType<PaintingSprite>();
@ -89,10 +98,22 @@ namespace UltraCombos.Frozen.RoyalGallery
texture = new Texture2D(2048, 2048, TextureFormat.ARGB32, false); texture = new Texture2D(2048, 2048, TextureFormat.ARGB32, false);
} }
if (tex_sign == null)
{
tex_sign = new Texture2D(1513, 625, TextureFormat.ARGB32, false);
}
if (texture.LoadImage(data.Content.ToByteArray(), false)) if (texture.LoadImage(data.Content.ToByteArray(), false))
{ {
Texture2D tex_tmp = null;
if (tex_sign.LoadImage(data.Signature.ToByteArray(), false))
{
tex_tmp = tex_sign;
Log($"Signature {role_id} is loaded. ({tex_sign.width} x {tex_sign.height})");
}
onMessageReceived.Invoke(data); onMessageReceived.Invoke(data);
onTextureReceived.Invoke(role_id, texture); onTextureReceived.Invoke(role_id, texture, tex_tmp);
Log($"Texture {role_id} is loaded. ({texture.width} x {texture.height})"); Log($"Texture {role_id} is loaded. ({texture.width} x {texture.height})");
DebugInformation.Instance.UpdateProperty("Last painting", $"{role_id} ({texture.width} x {texture.height})"); DebugInformation.Instance.UpdateProperty("Last painting", $"{role_id} ({texture.width} x {texture.height})");
@ -118,17 +139,15 @@ namespace UltraCombos.Frozen.RoyalGallery
private IndexInfo OnIndexRequest(int deviceId) private IndexInfo OnIndexRequest(int deviceId)
{ {
int res = 0; IndexInfo info = new IndexInfo();
info.id = m_IdList[index];
info.color = onRequestColor(info.id);
lock (idx_mtx) lock (idx_mtx)
{ {
res = index;
index = (index + 1) % m_IdList.Count; index = (index + 1) % m_IdList.Count;
} }
IndexInfo info = new IndexInfo();
info.id = m_IdList[index];
info.color = onRequestColor(info.id);
return info; return info;
} }
} }

@ -47,7 +47,7 @@
fixed4 col_dst = tex2D(_TargetTex, i.uv); fixed4 col_dst = tex2D(_TargetTex, i.uv);
fixed4 col_tra = tex2D(_TransitionTex, i.uv); fixed4 col_tra = tex2D(_TransitionTex, i.uv);
col_dst.rgb = col_dst.rgb * col_tra.r + col_src.rgb * (1 - col_tra.r); col_dst.rgb = col_dst.rgb * col_tra.g + col_src.rgb * (1 - col_tra.g);
return col_dst; return col_dst;
} }
ENDCG ENDCG

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

Loading…
Cancel
Save