toBuild
This commit is contained in:
parent
2fddc4b1cd
commit
b6dfa0721e
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
|
|
@ -56,5 +56,5 @@
|
||||||
"temp/": true,
|
"temp/": true,
|
||||||
"Temp/": true
|
"Temp/": true
|
||||||
},
|
},
|
||||||
"dotnet.defaultSolution": "mmorpg2d.sln"
|
"dotnet.defaultSolution": "2DMMOMirror.sln"
|
||||||
}
|
}
|
||||||
BIN
Assets/.DS_Store
vendored
BIN
Assets/.DS_Store
vendored
Binary file not shown.
8
Assets/Anim.meta
Normal file
8
Assets/Anim.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3e133fa0e945c4836a443e39853801a1
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
8
Assets/Anim/UIAnimation.meta
Normal file
8
Assets/Anim/UIAnimation.meta
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 970115ade3c444024823d63f13c49eaf
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
60
Assets/FlashWhenEnable.cs
Normal file
60
Assets/FlashWhenEnable.cs
Normal file
|
|
@ -0,0 +1,60 @@
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using UnityEngine;
|
||||||
|
using DG.Tweening;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
public class FlashWhenEnable : MonoBehaviour
|
||||||
|
{
|
||||||
|
[SerializeField] private SpriteRenderer _image;
|
||||||
|
[Header("Flash Settings")]
|
||||||
|
[SerializeField] private float _fadeDuration = 1.5f;
|
||||||
|
[SerializeField] private float _minAlpha = 0.4f;
|
||||||
|
|
||||||
|
private Sequence _flashSequence;
|
||||||
|
|
||||||
|
private void Awake()
|
||||||
|
{
|
||||||
|
_image = GetComponent<SpriteRenderer>();
|
||||||
|
}
|
||||||
|
|
||||||
|
void OnEnable()
|
||||||
|
{
|
||||||
|
StartFlashing();
|
||||||
|
|
||||||
|
}
|
||||||
|
void OnDisable()
|
||||||
|
{
|
||||||
|
StopFlashing();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void StartFlashing()
|
||||||
|
{
|
||||||
|
// Kill any existing animation
|
||||||
|
if (_flashSequence != null && _flashSequence.IsActive())
|
||||||
|
_flashSequence.Kill();
|
||||||
|
|
||||||
|
// Reset to original color
|
||||||
|
Color originalColor = _image.color;
|
||||||
|
originalColor.a = 1f;
|
||||||
|
_image.color = originalColor;
|
||||||
|
|
||||||
|
// Create subtle pulse animation
|
||||||
|
_flashSequence = DOTween.Sequence()
|
||||||
|
.Append(_image.DOFade(_minAlpha, _fadeDuration))
|
||||||
|
.Append(_image.DOFade(1f, _fadeDuration))
|
||||||
|
.Append(_image.transform.DOScale(0.385f, 0.34f))
|
||||||
|
.SetLoops(-1, LoopType.Yoyo)
|
||||||
|
.SetEase(Ease.InOutSine);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void StopFlashing()
|
||||||
|
{
|
||||||
|
_flashSequence?.Kill();
|
||||||
|
// Reset to full opacity
|
||||||
|
Color c = _image.color;
|
||||||
|
c.a = 1f;
|
||||||
|
_image.color = c;
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
11
Assets/FlashWhenEnable.cs.meta
Normal file
11
Assets/FlashWhenEnable.cs.meta
Normal file
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 88e90123eb9bf4e7c93d224d5652738e
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 5b07afdbcf13e43438545d591cfd2e4b
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -4824,6 +4824,7 @@ Transform:
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 5246544435235397805}
|
- {fileID: 5246544435235397805}
|
||||||
|
- {fileID: 4645088320856190337}
|
||||||
m_Father: {fileID: 4537453342636086539}
|
m_Father: {fileID: 4537453342636086539}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &931847196536547551
|
--- !u!1 &931847196536547551
|
||||||
|
|
@ -15643,6 +15644,7 @@ MonoBehaviour:
|
||||||
beingInviteUI: {fileID: 3403377910151212874}
|
beingInviteUI: {fileID: 3403377910151212874}
|
||||||
inPartyUI: {fileID: 6212582780142130674}
|
inPartyUI: {fileID: 6212582780142130674}
|
||||||
inPartyOwnerNameTxt: {fileID: 4157618920817146930}
|
inPartyOwnerNameTxt: {fileID: 4157618920817146930}
|
||||||
|
charPartyText: {fileID: 3001089222309157174}
|
||||||
inPartyPlayersTxt: {fileID: 4763456039480402226}
|
inPartyPlayersTxt: {fileID: 4763456039480402226}
|
||||||
inviteOwnerNameTxt: {fileID: 7030286270905106535}
|
inviteOwnerNameTxt: {fileID: 7030286270905106535}
|
||||||
uiCanvasGroup: {fileID: 2096525255603639546}
|
uiCanvasGroup: {fileID: 2096525255603639546}
|
||||||
|
|
@ -27170,6 +27172,103 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
SpriteName: BackFingersR
|
SpriteName: BackFingersR
|
||||||
SpriteNameFallback: []
|
SpriteNameFallback: []
|
||||||
|
--- !u!1 &3990099247561434397
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 8367852803661412341}
|
||||||
|
- component: {fileID: 8898226394005770826}
|
||||||
|
- component: {fileID: 3001089222309157174}
|
||||||
|
m_Layer: 6
|
||||||
|
m_Name: InPartyTxt\
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &8367852803661412341
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3990099247561434397}
|
||||||
|
serializedVersion: 2
|
||||||
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
|
m_LocalPosition: {x: -0.94, y: 2.5149999, z: 0}
|
||||||
|
m_LocalScale: {x: 0.22460768, y: 0.22460768, z: 0.22460768}
|
||||||
|
m_ConstrainProportionsScale: 0
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 4645088320856190337}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!23 &8898226394005770826
|
||||||
|
MeshRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3990099247561434397}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 1
|
||||||
|
m_ReceiveShadows: 1
|
||||||
|
m_DynamicOccludee: 1
|
||||||
|
m_StaticShadowCaster: 0
|
||||||
|
m_MotionVectors: 1
|
||||||
|
m_LightProbeUsage: 1
|
||||||
|
m_ReflectionProbeUsage: 1
|
||||||
|
m_RayTracingMode: 2
|
||||||
|
m_RayTraceProcedural: 0
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_RendererPriority: 0
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: 2100000, guid: 68342bf410426cc48a15d69e0135f719, type: 3}
|
||||||
|
m_StaticBatchInfo:
|
||||||
|
firstSubMesh: 0
|
||||||
|
subMeshCount: 0
|
||||||
|
m_StaticBatchRoot: {fileID: 0}
|
||||||
|
m_ProbeAnchor: {fileID: 0}
|
||||||
|
m_LightProbeVolumeOverride: {fileID: 0}
|
||||||
|
m_ScaleInLightmap: 1
|
||||||
|
m_ReceiveGI: 1
|
||||||
|
m_PreserveUVs: 0
|
||||||
|
m_IgnoreNormalsForChartDetection: 0
|
||||||
|
m_ImportantGI: 0
|
||||||
|
m_StitchLightmapSeams: 1
|
||||||
|
m_SelectedEditorRenderState: 3
|
||||||
|
m_MinimumChartSize: 4
|
||||||
|
m_AutoUVMaxDistance: 0.5
|
||||||
|
m_AutoUVMaxAngle: 89
|
||||||
|
m_LightmapParameters: {fileID: 0}
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 0
|
||||||
|
m_AdditionalVertexStreams: {fileID: 0}
|
||||||
|
--- !u!102 &3001089222309157174
|
||||||
|
TextMesh:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 3990099247561434397}
|
||||||
|
m_Text: Nim's Party
|
||||||
|
m_OffsetZ: 0
|
||||||
|
m_CharacterSize: 1
|
||||||
|
m_LineSpacing: 1
|
||||||
|
m_Anchor: 0
|
||||||
|
m_Alignment: 0
|
||||||
|
m_TabSize: 4
|
||||||
|
m_FontSize: 20
|
||||||
|
m_FontStyle: 0
|
||||||
|
m_RichText: 1
|
||||||
|
m_Font: {fileID: 12800000, guid: 68342bf410426cc48a15d69e0135f719, type: 3}
|
||||||
|
m_Color:
|
||||||
|
serializedVersion: 2
|
||||||
|
rgba: 4294967295
|
||||||
--- !u!1 &4012019610277481639
|
--- !u!1 &4012019610277481639
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -51909,6 +52008,119 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
SpriteName: FrontHandL
|
SpriteName: FrontHandL
|
||||||
SpriteNameFallback: []
|
SpriteNameFallback: []
|
||||||
|
--- !u!1 &8050475778169126891
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 4817886438902872342}
|
||||||
|
- component: {fileID: 4119767101162159600}
|
||||||
|
- component: {fileID: 51015297234249886}
|
||||||
|
- component: {fileID: 1612153118918857556}
|
||||||
|
m_Layer: 6
|
||||||
|
m_Name: Party Indicator
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 0
|
||||||
|
--- !u!224 &4817886438902872342
|
||||||
|
RectTransform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8050475778169126891}
|
||||||
|
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||||
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
|
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
|
||||||
|
m_ConstrainProportionsScale: 1
|
||||||
|
m_Children: []
|
||||||
|
m_Father: {fileID: 4645088320856190337}
|
||||||
|
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: -1.3720002, y: 2.22}
|
||||||
|
m_SizeDelta: {x: 2.56, y: 2.56}
|
||||||
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
|
--- !u!212 &4119767101162159600
|
||||||
|
SpriteRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8050475778169126891}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_CastShadows: 0
|
||||||
|
m_ReceiveShadows: 0
|
||||||
|
m_DynamicOccludee: 1
|
||||||
|
m_StaticShadowCaster: 0
|
||||||
|
m_MotionVectors: 1
|
||||||
|
m_LightProbeUsage: 1
|
||||||
|
m_ReflectionProbeUsage: 1
|
||||||
|
m_RayTracingMode: 0
|
||||||
|
m_RayTraceProcedural: 0
|
||||||
|
m_RenderingLayerMask: 1
|
||||||
|
m_RendererPriority: 0
|
||||||
|
m_Materials:
|
||||||
|
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
|
||||||
|
m_StaticBatchInfo:
|
||||||
|
firstSubMesh: 0
|
||||||
|
subMeshCount: 0
|
||||||
|
m_StaticBatchRoot: {fileID: 0}
|
||||||
|
m_ProbeAnchor: {fileID: 0}
|
||||||
|
m_LightProbeVolumeOverride: {fileID: 0}
|
||||||
|
m_ScaleInLightmap: 1
|
||||||
|
m_ReceiveGI: 1
|
||||||
|
m_PreserveUVs: 0
|
||||||
|
m_IgnoreNormalsForChartDetection: 0
|
||||||
|
m_ImportantGI: 0
|
||||||
|
m_StitchLightmapSeams: 1
|
||||||
|
m_SelectedEditorRenderState: 0
|
||||||
|
m_MinimumChartSize: 4
|
||||||
|
m_AutoUVMaxDistance: 0.5
|
||||||
|
m_AutoUVMaxAngle: 89
|
||||||
|
m_LightmapParameters: {fileID: 0}
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 0
|
||||||
|
m_Sprite: {fileID: 21300000, guid: 8a97328d004d7b14ab15f275136938c6, type: 3}
|
||||||
|
m_Color: {r: 0.7028302, g: 1, b: 0.7223157, a: 1}
|
||||||
|
m_FlipX: 0
|
||||||
|
m_FlipY: 0
|
||||||
|
m_DrawMode: 0
|
||||||
|
m_Size: {x: 1, y: 1}
|
||||||
|
m_AdaptiveModeThreshold: 0.5
|
||||||
|
m_SpriteTileMode: 0
|
||||||
|
m_WasSpriteAssigned: 1
|
||||||
|
m_MaskInteraction: 0
|
||||||
|
m_SpriteSortPoint: 0
|
||||||
|
--- !u!114 &51015297234249886
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8050475778169126891}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 88e90123eb9bf4e7c93d224d5652738e, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
_image: {fileID: 4119767101162159600}
|
||||||
|
_fadeDuration: 0.7
|
||||||
|
_minAlpha: 0.4
|
||||||
|
--- !u!222 &1612153118918857556
|
||||||
|
CanvasRenderer:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8050475778169126891}
|
||||||
|
m_CullTransparentMesh: 1
|
||||||
--- !u!1 &8062535858586599546
|
--- !u!1 &8062535858586599546
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -56998,6 +57210,52 @@ MonoBehaviour:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
SpriteName: LeftLegR
|
SpriteName: LeftLegR
|
||||||
SpriteNameFallback: []
|
SpriteNameFallback: []
|
||||||
|
--- !u!1 &8782406400617611373
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 4645088320856190337}
|
||||||
|
- component: {fileID: 1439567813487260570}
|
||||||
|
m_Layer: 6
|
||||||
|
m_Name: Texts
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!4 &4645088320856190337
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8782406400617611373}
|
||||||
|
serializedVersion: 2
|
||||||
|
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_ConstrainProportionsScale: 0
|
||||||
|
m_Children:
|
||||||
|
- {fileID: 4817886438902872342}
|
||||||
|
- {fileID: 8367852803661412341}
|
||||||
|
m_Father: {fileID: 6536042509376752811}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!210 &1439567813487260570
|
||||||
|
SortingGroup:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 8782406400617611373}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_SortingLayerID: 0
|
||||||
|
m_SortingLayer: 0
|
||||||
|
m_SortingOrder: 25
|
||||||
|
m_SortAtRoot: 0
|
||||||
--- !u!1 &8798971725448354499
|
--- !u!1 &8798971725448354499
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,8 @@ public class invitePlayer : NetworkBehaviour
|
||||||
[SerializeField] private GameObject inviteUI, beingInviteUI;
|
[SerializeField] private GameObject inviteUI, beingInviteUI;
|
||||||
[SerializeField] private GameObject inPartyUI;
|
[SerializeField] private GameObject inPartyUI;
|
||||||
[SerializeField] private TMP_Text inPartyOwnerNameTxt;
|
[SerializeField] private TMP_Text inPartyOwnerNameTxt;
|
||||||
|
[SerializeField] private TextMesh charPartyText;
|
||||||
|
[SerializeField] private GameObject charPartyUI;
|
||||||
[SerializeField] private TMP_Text inPartyPlayersTxt;
|
[SerializeField] private TMP_Text inPartyPlayersTxt;
|
||||||
[SerializeField] private TMP_Text inviteOwnerNameTxt;
|
[SerializeField] private TMP_Text inviteOwnerNameTxt;
|
||||||
[SerializeField] private CanvasGroup uiCanvasGroup, bUiCanvasGroup;
|
[SerializeField] private CanvasGroup uiCanvasGroup, bUiCanvasGroup;
|
||||||
|
|
@ -32,6 +34,9 @@ public class invitePlayer : NetworkBehaviour
|
||||||
uiCanvasGroup.alpha = 0;
|
uiCanvasGroup.alpha = 0;
|
||||||
|
|
||||||
inviteUI.SetActive(false);
|
inviteUI.SetActive(false);
|
||||||
|
inPartyUI.SetActive(false);
|
||||||
|
// charPartyUI.SetActive(false);
|
||||||
|
charPartyText.text = "";
|
||||||
beingInviteUI.SetActive(false);
|
beingInviteUI.SetActive(false);
|
||||||
|
|
||||||
onScreenPosition = panelRect.anchoredPosition;
|
onScreenPosition = panelRect.anchoredPosition;
|
||||||
|
|
@ -132,6 +137,8 @@ public class invitePlayer : NetworkBehaviour
|
||||||
{
|
{
|
||||||
inPartyUI.SetActive(true);
|
inPartyUI.SetActive(true);
|
||||||
inPartyOwnerNameTxt.text = $"{ownerName}'s Party";
|
inPartyOwnerNameTxt.text = $"{ownerName}'s Party";
|
||||||
|
inPartyOwnerNameTxt.text = charPartyText.text;
|
||||||
|
charPartyUI.SetActive(true);
|
||||||
|
|
||||||
playerNetwork[] players = FindObjectsOfType<playerNetwork>();
|
playerNetwork[] players = FindObjectsOfType<playerNetwork>();
|
||||||
List<string> playerNames = new List<string>();
|
List<string> playerNames = new List<string>();
|
||||||
|
|
@ -149,5 +156,7 @@ public class invitePlayer : NetworkBehaviour
|
||||||
public void LeaveParty(){
|
public void LeaveParty(){
|
||||||
//playerNetwork.localPlayer.CmdLeaveParty();
|
//playerNetwork.localPlayer.CmdLeaveParty();
|
||||||
inPartyUI.SetActive(false);
|
inPartyUI.SetActive(false);
|
||||||
|
charPartyUI.SetActive(false);
|
||||||
|
charPartyText.text = "";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -17,11 +17,11 @@
|
||||||
"hash": "f8c8347af3a144069dffd6120f1c4142f8120891"
|
"hash": "f8c8347af3a144069dffd6120f1c4142f8120891"
|
||||||
},
|
},
|
||||||
"com.unity.2d.animation": {
|
"com.unity.2d.animation": {
|
||||||
"version": "9.0.3",
|
"version": "9.1.3",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.2d.common": "8.0.1",
|
"com.unity.2d.common": "8.0.4",
|
||||||
"com.unity.2d.sprite": "1.0.0",
|
"com.unity.2d.sprite": "1.0.0",
|
||||||
"com.unity.collections": "1.1.0",
|
"com.unity.collections": "1.1.0",
|
||||||
"com.unity.modules.animation": "1.0.0",
|
"com.unity.modules.animation": "1.0.0",
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.2d.aseprite": {
|
"com.unity.2d.aseprite": {
|
||||||
"version": "1.0.1",
|
"version": "1.1.6",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
@ -42,7 +42,7 @@
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.2d.common": {
|
"com.unity.2d.common": {
|
||||||
"version": "8.0.1",
|
"version": "8.0.4",
|
||||||
"depth": 2,
|
"depth": 2,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
@ -62,13 +62,13 @@
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.2d.psdimporter": {
|
"com.unity.2d.psdimporter": {
|
||||||
"version": "8.0.2",
|
"version": "8.0.5",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.2d.common": "8.0.1",
|
"com.unity.2d.common": "8.0.2",
|
||||||
"com.unity.2d.sprite": "1.0.0",
|
"com.unity.2d.sprite": "1.0.0",
|
||||||
"com.unity.2d.animation": "9.0.1"
|
"com.unity.2d.animation": "9.1.1"
|
||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
|
|
@ -79,11 +79,11 @@
|
||||||
"dependencies": {}
|
"dependencies": {}
|
||||||
},
|
},
|
||||||
"com.unity.2d.spriteshape": {
|
"com.unity.2d.spriteshape": {
|
||||||
"version": "9.0.2",
|
"version": "9.0.5",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.2d.common": "8.0.1",
|
"com.unity.2d.common": "8.0.4",
|
||||||
"com.unity.mathematics": "1.1.0",
|
"com.unity.mathematics": "1.1.0",
|
||||||
"com.unity.modules.physics2d": "1.0.0"
|
"com.unity.modules.physics2d": "1.0.0"
|
||||||
},
|
},
|
||||||
|
|
@ -99,7 +99,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.2d.tilemap.extras": {
|
"com.unity.2d.tilemap.extras": {
|
||||||
"version": "3.1.1",
|
"version": "3.1.3",
|
||||||
"depth": 1,
|
"depth": 1,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
@ -111,11 +111,12 @@
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
"com.unity.burst": {
|
"com.unity.burst": {
|
||||||
"version": "1.8.8",
|
"version": "1.8.18",
|
||||||
"depth": 3,
|
"depth": 3,
|
||||||
"source": "registry",
|
"source": "registry",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.mathematics": "1.2.1"
|
"com.unity.mathematics": "1.2.1",
|
||||||
|
"com.unity.modules.jsonserialize": "1.0.0"
|
||||||
},
|
},
|
||||||
"url": "https://packages.unity.com"
|
"url": "https://packages.unity.com"
|
||||||
},
|
},
|
||||||
|
|
@ -148,14 +149,14 @@
|
||||||
"depth": 0,
|
"depth": 0,
|
||||||
"source": "builtin",
|
"source": "builtin",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.2d.animation": "9.0.3",
|
"com.unity.2d.animation": "9.1.3",
|
||||||
"com.unity.2d.pixel-perfect": "5.0.3",
|
"com.unity.2d.pixel-perfect": "5.0.3",
|
||||||
"com.unity.2d.psdimporter": "8.0.2",
|
"com.unity.2d.psdimporter": "8.0.5",
|
||||||
"com.unity.2d.sprite": "1.0.0",
|
"com.unity.2d.sprite": "1.0.0",
|
||||||
"com.unity.2d.spriteshape": "9.0.2",
|
"com.unity.2d.spriteshape": "9.0.5",
|
||||||
"com.unity.2d.tilemap": "1.0.0",
|
"com.unity.2d.tilemap": "1.0.0",
|
||||||
"com.unity.2d.tilemap.extras": "3.1.1",
|
"com.unity.2d.tilemap.extras": "3.1.3",
|
||||||
"com.unity.2d.aseprite": "1.0.1"
|
"com.unity.2d.aseprite": "1.1.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"com.unity.ide.rider": {
|
"com.unity.ide.rider": {
|
||||||
|
|
|
||||||
|
|
@ -5,16 +5,16 @@ EditorBuildSettings:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_Scenes:
|
m_Scenes:
|
||||||
- enabled: 0
|
- enabled: 1
|
||||||
path: Assets/Scenes/GameLogin.unity
|
path: Assets/Scenes/GameLogin.unity
|
||||||
guid: 8f7fc7ae237f341739c369fc7d9f4b75
|
guid: 8f7fc7ae237f341739c369fc7d9f4b75
|
||||||
- enabled: 0
|
- enabled: 1
|
||||||
path: Assets/Scenes/MenuScene.unity
|
path: Assets/Scenes/MenuScene.unity
|
||||||
guid: a141cf40801414f09a4017e4a9f84683
|
guid: a141cf40801414f09a4017e4a9f84683
|
||||||
- enabled: 1
|
- enabled: 1
|
||||||
path: Assets/Scenes/Game.unity
|
path: Assets/Scenes/Game.unity
|
||||||
guid: 2b2559cffabdc0048a9735fe802336e4
|
guid: 2b2559cffabdc0048a9735fe802336e4
|
||||||
- enabled: 0
|
- enabled: 1
|
||||||
path: Assets/Scenes/NewCharacter.unity
|
path: Assets/Scenes/NewCharacter.unity
|
||||||
guid: 46395c88cc7306041afeffc5eb358c47
|
guid: 46395c88cc7306041afeffc5eb358c47
|
||||||
m_configObjects: {}
|
m_configObjects: {}
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,2 @@
|
||||||
lastUpgrade=01014
|
lastUpgrade=01014
|
||||||
proj.pluginVersion=0.10.14
|
proj.pluginVersion=0.10.14
|
||||||
proj.AppId=178135978803
|
|
||||||
and.BundleId=com.playpool.MMORPG
|
|
||||||
proj.classDir=Assets
|
|
||||||
proj.ConstantsClassName=GPGSIds
|
|
||||||
and.ResourceData=%3c%3fxml+version%3d%221.0%22+encoding%3d%22utf-8%22%3f%3e%0a%3c%21--Google+Play+game+services+IDs.+Save+this+file+as+res%2fvalues%2fgames-ids.xml+in+your+project.--%3e%0a%3cresources%3e%0a++%3c%21--app_id--%3e%0a++%3cstring+name%3d%22app_id%22+translatable%3d%22false%22%3e178135978803%3c%2fstring%3e%0a++%3c%21--package_name--%3e%0a++%3cstring+name%3d%22package_name%22+translatable%3d%22false%22%3ecom.playpool.MMORPG%3c%2fstring%3e%0a%3c%2fresources%3e
|
|
||||||
and.ClientId=178135978803-ks0s5nmdlnujpic2tntm39mmuc39ehh6.apps.googleusercontent.com
|
|
||||||
android.SetupDone=true
|
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,4 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<projectSettings>
|
<projectSettings>
|
||||||
<projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
|
<projectSetting name="Google.IOSResolver.VerboseLoggingEnabled" value="False" />
|
||||||
<projectSetting name="Google.PackageManagerResolver.VerboseLoggingEnabled" value="False" />
|
|
||||||
<projectSetting name="Google.VersionHandler.VerboseLoggingEnabled" value="False" />
|
|
||||||
<projectSetting name="GooglePlayServices.AutoResolverEnabled" value="False" />
|
|
||||||
<projectSetting name="GooglePlayServices.PromptBeforeAutoResolution" value="False" />
|
|
||||||
<projectSetting name="GooglePlayServices.UseJetifier" value="True" />
|
|
||||||
</projectSettings>
|
</projectSettings>
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
m_EditorVersion: 2022.3.10f1
|
m_EditorVersion: 2022.3.53f1
|
||||||
m_EditorVersionWithRevision: 2022.3.10f1 (ff3792e53c62)
|
m_EditorVersionWithRevision: 2022.3.53f1 (df4e529d20d3)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user