Fixed $105 give food

This commit is contained in:
IDMhan 2024-01-03 11:54:03 +09:00
parent 60081bccfe
commit 60de0a9811
104 changed files with 920 additions and 47 deletions

View File

@ -193,6 +193,36 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2044885316}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: TakeFoodFromPlayer
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: BlueWaterProject.TycoonPlayer, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: m_Name
@ -2205,7 +2235,7 @@ BoxCollider:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
@ -2235,7 +2265,19 @@ MonoBehaviour:
m_Calls: []
onUse:
m_PersistentCalls:
m_Calls: []
m_Calls:
- m_Target: {fileID: 2044885316}
m_TargetAssemblyTypeName: BlueWaterProject.TycoonPlayer, Assembly-CSharp
m_MethodName: TakeFoodFromKitchen
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 &361357819
GameObject:
m_ObjectHideFlags: 0
@ -2357,7 +2399,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &395321441
Transform:
m_ObjectHideFlags: 0
@ -4355,6 +4397,36 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2044885316}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: TakeFoodFromPlayer
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: BlueWaterProject.TycoonPlayer, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: m_Name
@ -4776,6 +4848,36 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2044885316}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: TakeFoodFromPlayer
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: BlueWaterProject.TycoonPlayer, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: m_Name
@ -5028,6 +5130,36 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2044885316}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: TakeFoodFromPlayer
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: BlueWaterProject.TycoonPlayer, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: m_Name
@ -5257,28 +5389,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_persistent: 0
<EnemyViewDataSo>k__BackingField: {fileID: 11400000, guid: d4ed8ebcf48bbdb4d84caf4a4cab7c04,
type: 2}
<PirateViewDataSo>k__BackingField: {fileID: 11400000, guid: 33ac25d6eca8f6447a342dfb44a2a282,
type: 2}
<EnemyStatDataSo>k__BackingField: {fileID: 11400000, guid: c19ae12d221eae64f90d58e15a04d592,
type: 2}
<PirateStatDataSo>k__BackingField: {fileID: 11400000, guid: 0f0ed8929be00534e97398bb55d8c541,
type: 2}
<EnemyUnitStatDataSo>k__BackingField: {fileID: 11400000, guid: d363ca1023ab0754489bda2d69d79564,
type: 2}
<PirateUnitDataSo>k__BackingField: {fileID: 11400000, guid: 6cd374040492d94498f1cce6c3a10e14,
type: 2}
<CardDataSo>k__BackingField: {fileID: 11400000, guid: 0db3b35c9121e9e4bbe8559a0922145f,
type: 2}
<CardList>k__BackingField:
- card_001
- card_002
- card_003
- card_004
- card_005
- card_006
- card_007
<PlayerInventory>k__BackingField:
fishInfoList: []
mouseSpot: {fileID: 1347266192824951316, guid: 049de7a77e0534ced92b672937a0f8db,
type: 3}
boat: {fileID: 2987405546353765599, guid: 96173da392e9a408d9aea814b4cfe00e, type: 3}
@ -5668,6 +5780,36 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2044885316}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: TakeFoodFromPlayer
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: BlueWaterProject.TycoonPlayer, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: m_Name
@ -6234,6 +6376,36 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 2044885316}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: TakeFoodFromPlayer
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: BlueWaterProject.TycoonPlayer, Assembly-CSharp
objectReference: {fileID: 0}
- target: {fileID: 8124020734292843277, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: events.onUse.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0}
- target: {fileID: 8618344245884134178, guid: 5e6031a186487438097c5f82f8803b6c,
type: 3}
propertyPath: m_Name

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e17ff32e5dc9e1c41b8d7e41f871d450
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -95,14 +95,14 @@ namespace BlueWaterProject
if (!Physics.Raycast(ray, out hit)) return false;
if (!hit.collider.CompareTag("Ground")) return false;
Destroy(gameObject);
var obj = Instantiate(DataManager.Inst.boat, GameManager.Inst.ShipPlayer.transform.position,
Quaternion.identity);
var boat = obj.GetComponent<Boat>();
boat.TypeCardSprite.sprite = typeImage.sprite;
boat.Target = hit.point;
boat.CardIndex = card.Idx;
//boat.OnLanded += UnitManager.Inst.PirateUnitCreateAndAssign;
// var obj = Instantiate(DataManager.Inst.boat, GameManager.Inst.ShipPlayer.transform.position,
// Quaternion.identity);
//
// var boat = obj.GetComponent<Boat>();
// boat.TypeCardSprite.sprite = typeImage.sprite;
// boat.Target = hit.point;
// boat.CardIndex = card.Idx;
// //boat.OnLanded += UnitManager.Inst.PirateUnitCreateAndAssign;
return true;

View File

@ -132,8 +132,8 @@ namespace BlueWaterProject
public void GotoShipDeck()
{
var point = GameManager.Inst.ShipPlayer.transform.Find("TeleportPoint");
transform.position = point.position;
// var point = GameManager.Inst.ShipPlayer.transform.Find("TeleportPoint");
// transform.position = point.position;
}
public void StartInteraction(Transform target)

View File

@ -20,12 +20,8 @@ namespace BlueWaterProject
[field: SerializeField] public List<Crewmate> CurrentCrewmateList { get; set; }
public IInIslandPlayer CurrentInIslandPlayer { get; set; }
// Player
[field: Title("Player")]
[field: SerializeField] public ShipPlayer ShipPlayer { get; private set; }
[field: SerializeField] public InShipPlayer InShipPlayer { get; private set; }
[Title("Tycoon")]
public TycoonPlayer TycoonPlayer { get; private set; }
public bool IsBuildMode { get; set; }
// Game Data
@ -37,8 +33,7 @@ namespace BlueWaterProject
private void Init()
{
ShipPlayer = FindAnyObjectByType<ShipPlayer>();
InShipPlayer = FindAnyObjectByType<InShipPlayer>();
TycoonPlayer = FindAnyObjectByType<TycoonPlayer>();
}
protected override void OnAwake()
{

View File

@ -23,6 +23,7 @@ namespace BlueWaterProject
npc.FoodImg.gameObject.SetActive(true);
elapsedTime = 0f;
npc.IsGetFood = false;
}
public void OnUpdate(NpcStateMachine npcStateMachine)
@ -31,10 +32,26 @@ namespace BlueWaterProject
{
elapsedTime += Time.deltaTime;
npc.BarkFillImg.fillAmount = Mathf.Clamp(elapsedTime / fillTime, 0, 1);
if (npc.IsGetFood)
{
npc.BarkImg.gameObject.SetActive(false);
npc.BarkFillImg.gameObject.SetActive(false);
npc.FoodImg.gameObject.SetActive(false);
npcStateMachine.InstantiateUi(DataManager.Inst.emojiHeart, npc.EmojiTransform);
npc.AssignedSeat.IsUsing = false;
npc.AssignedSeat.IsDirty = true;
npc.DoSeat = false;
npcStateMachine.ChangeState(new WalkOutSate(npc));
}
}
else if (elapsedTime >= fillTime)
{
npcStateMachine.InstantiateUi(DataManager.Inst.emojiAnger, npc.EmojiTransform);
npc.BarkImg.gameObject.SetActive(false);
npc.BarkFillImg.gameObject.SetActive(false);
npc.FoodImg.gameObject.SetActive(false);

View File

@ -91,10 +91,10 @@ namespace BlueWaterProject
playerInput.defaultActionMap = PLAYER_NAME;
if (GameManager.Inst.ShipPlayer != null)
{
GameManager.Inst.ShipPlayer.GetComponent<PlayerInput>().enabled = false;
}
// if (GameManager.Inst.ShipPlayer != null)
// {
// GameManager.Inst.ShipPlayer.GetComponent<PlayerInput>().enabled = false;
// }
playerInput.enabled = true;

View File

@ -23,6 +23,7 @@ namespace BlueWaterProject
public Image BarkFillImg { get; set; }
public Image FoodImg { get; set; }
public Transform EmojiTransform { get; set; }
public bool IsGetFood { get; set; }
private void Awake()
{

View File

@ -18,6 +18,8 @@ namespace BlueWaterProject
private Transform interactionTarget;
private Transform visualLook;
private Rigidbody rb;
private ProximitySelector proximitySelector;
public SpriteRenderer spriteRenderer; //TODO : 나중에 스파인으로 바꾸고 삭제
public Sprite sideSprite;
public Sprite backSprite;
@ -32,6 +34,7 @@ namespace BlueWaterProject
spriteRenderer = visualLook.GetComponent<SpriteRenderer>();
playerInput = GetComponent<PlayerInput>();
foodTransform = transform.Find("Food");
proximitySelector = GetComponent<ProximitySelector>();
}
private void Awake()
@ -158,6 +161,25 @@ namespace BlueWaterProject
transform.position = position;
}
public void TakeFoodFromKitchen()
{
if (!foodTransform.gameObject.activeSelf) foodTransform.gameObject.SetActive(true);
}
public void TakeFoodFromPlayer()
{
if (!foodTransform.gameObject.activeSelf) return;
if (proximitySelector == null || proximitySelector.CurrentUsable == null) return;
var tycoonNpc = proximitySelector.CurrentUsable.gameObject.GetComponent<TycoonNpc>();
if (tycoonNpc != null && tycoonNpc.DoSeat)
{
tycoonNpc.IsGetFood = true;
foodTransform.gameObject.SetActive(false);
}
}
public void StartInteraction(Transform target)
{

View File

@ -48,7 +48,7 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spritePixelsToUnits: 512
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f5789d13135b86645a366dac6583d1cd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3643c0d76ec153646b1203880bfb64ed
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 078b8f13a17171b49892ad10426d5af0
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f9406a33814af9c47b352e77f079d798
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9aacf6f3043624194bb6f6fe9a580786
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b1d738c46034bc244bd356692577373c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2d6d5d59d45ce8a4784ba6c47984a23e
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 560a88da2bbc70140bed167f0ba7fe37
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: fb01be13d6e88ca488dda82150319bfc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 117dcc671050f5247bd8743b91ecaab7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4d9b575363cdb56408d92f7d7f0e5216
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 171c5051d845c4545a6679cdcb9e8290
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e381f1e638a8aec4dbd9a7be673b56e2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 01db744855bbae74481522d48fd63008
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e5f625ae60b99fe4ab78d44cfb58ce5a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b606e558541a7b14593ea370c1a31da1
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c13a7e89fcc1f5544b4debda9d682854
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9d6eeb26838ae2140a98c7b012c07610
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 46615cbdbe482664aaf8d3fe2af274c8
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 92b78aa6c7b02924c907a69383e7722f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 169dbd692ce7b8a4083e3e77421ce8d0
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 9a785472f49cbc0419f4e80050360f8a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: acc7135a62c70bb40bfd196dcc0dbf58
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 43b92591c923d1543bc95a9b89918a6c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4c1d290c89eb9a146a0c3fc3c5d97639
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 79d6a8f7106f5a949afdf0f9fce6e5c9
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5db5e6540b70aa44a8b8f0be7cbc03a4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: b81586c5bf3938042babe319ccb6b693
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 29400b82342c15b44bebd36e5f253c7a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e3dca3dc2724503479b532ec6f801f2f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5a3da110bff34d54eb93d1c3c7755741
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 590bfaf71ac68024e96342bd38a2e799
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 89c6283ed4a7a914db4ed32d9fe4be1b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2133c1709cbeab043b2c0d4a09f8c560
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 61a9883a71fe42f4cb3a2538927c5b54
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 107656dc7c8decd4b98ddacdb4c63d9c
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 69578b34b0b99fd408db1f26e709204b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 890975c726da4f447a9fdbb24e0ac5a6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1977e46ddf171054ba06e70c3a17b562
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d04dae1efd4c20f42801fa99bfb48c71
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f48e38a1694a4a94ba7bfa99b5bb8da7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a760ee77bdfe6fc4fbfeb4e74d81e9ee
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7ac1fca502db8634ca8a220957ce0efe
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 03276c81a3b7e1f4f8b9a2c42d29ccb5
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 4c2fe1e05f53ce540a7e6629e37e62ba
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 41dc081f41d06ad4cb3a976e3bc784ff
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7224afe475473f5479a4be84354c0ffe
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6566ea9453ea9a54c8adda4ce157bfe5
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8a6eaa4e4e356664da332e906c4116ca
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d78d339535406c443be8ab962fe3faed
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 6556a12f622b9f84a87c93e43a05c57a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7adde0d8ab9d11c4f8958df473963096
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2e0d514b37da90b43aca77d71d4ea274
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f73b81d6a28009a4d8a6cfa24e4f6670
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 14eb0de10b56d7d48aa47c34c085763a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: bab8f8e2fd66cc94eb0381c12da4f8a1
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 853d51cc63a44614b8aa108c20970d53
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0acaab50ea80e2740907f9fb8e96d5cb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 00d3be9741969ee4abb41a0d36893d12
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a84c2fae02ab66e4bb10f4b632b4e59f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ff46b33770bc0e04da5553db516b2791
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d4762985b08cf424d8a389bd106e9c41
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 82f4200e470c7a2459f54ef829fd130b
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8f7926653749bc042b66acaf162cb653
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d8244e47333fea34cabbe75f30b489cd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: a60eb26401f5d2e40a3f8ad3a0cdd2ae
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d20f46daec1cff04b8767c37cbc64dfd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1e0bc8e64ca5a204ab01fcb065ad3ea4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0439b345dc19afc4e9e38a45964c21d2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 2f034bb78093baf41a5b14693eefb6ba
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 37a76039173f99b4fac971349e64b845
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 12f5d0647e98dad4cba5773dbfe617ee
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: cfa06a72ad668b64e84eb67a6653c27a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 5f372c15f48325e4da788631806fbd37
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d48ea718ba1476a4baa5cd9e66f6ed78
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 21b40e7d71233864788700238fab175d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 44688b79fc3aa6a44b5c47a92a453722
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c6b5601000159b44594b95b58dc95e5e
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1f67bb1f7a0ccac4bacceb5680482ca2
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d418d21b145ca9e4289690cca70d800d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: ba01c8813d9d8e645a60034600445394
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 373fa280b9df46f45901d7ac3fea3beb
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d0b0bdbd9366c9e4fba085f618ca54ba
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c59e446cf466a424daed6859d731bc80
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 494657561b44a1c489255e7049d56ad7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0bfa1827c30ff98418b3b36047505a15
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d3504844ffe57564caa188ff0f30bae8
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 40756660825b35747929372b595fa82f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c3c34eebf26184b4fb5b0a9dfd25567f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More