出牌功能增加

Author: wayen22884

Assets/318153cee052596c.jpg

@@ -29,48 +29,12 @@ MonoBehaviour:
     m_SerializedLabels: []
     m_MainAsset: {fileID: 0}
     m_TargetAsset: {fileID: 0}
-  - m_GUID: 1f1dc217b0476ad41928e31d4ba6f443
-    m_Address: picture/frame_red.png
+  - m_GUID: c66c114ad23cfa747a9e77732ec6e5e3
+    m_Address: Data/CardData.asset
     m_ReadOnly: 0
     m_SerializedLabels: []
-    m_MainAsset: {fileID: 2800000, guid: 1f1dc217b0476ad41928e31d4ba6f443, type: 3}
-    m_TargetAsset: {fileID: 2800000, guid: 1f1dc217b0476ad41928e31d4ba6f443, type: 3}
-  - m_GUID: b8604eb586c7cf14cafc83c50819839a
-    m_Address: picture/frame_green.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    m_MainAsset: {fileID: 2800000, guid: b8604eb586c7cf14cafc83c50819839a, type: 3}
-    m_TargetAsset: {fileID: 2800000, guid: b8604eb586c7cf14cafc83c50819839a, type: 3}
-  - m_GUID: 603deb288ad665646b6ad9ee75015ac3
-    m_Address: picture/card_red.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    m_MainAsset: {fileID: 2800000, guid: 603deb288ad665646b6ad9ee75015ac3, type: 3}
-    m_TargetAsset: {fileID: 2800000, guid: 603deb288ad665646b6ad9ee75015ac3, type: 3}
-  - m_GUID: 389296803e5e3a14c80b681590d4ea80
-    m_Address: picture/stone.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    m_MainAsset: {fileID: 2800000, guid: 389296803e5e3a14c80b681590d4ea80, type: 3}
-    m_TargetAsset: {fileID: 2800000, guid: 389296803e5e3a14c80b681590d4ea80, type: 3}
-  - m_GUID: f3be387eb8a9f1f47a3289fbd91154fd
-    m_Address: picture/frame_yellow.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    m_MainAsset: {fileID: 2800000, guid: f3be387eb8a9f1f47a3289fbd91154fd, type: 3}
-    m_TargetAsset: {fileID: 2800000, guid: f3be387eb8a9f1f47a3289fbd91154fd, type: 3}
-  - m_GUID: fba3c2ee578c687458c6f01510b2bd60
-    m_Address: picture/card_green.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    m_MainAsset: {fileID: 2800000, guid: fba3c2ee578c687458c6f01510b2bd60, type: 3}
-    m_TargetAsset: {fileID: 2800000, guid: fba3c2ee578c687458c6f01510b2bd60, type: 3}
-  - m_GUID: f185afb01ee091d44a86b3620bb93291
-    m_Address: picture/card_yellow.png
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    m_MainAsset: {fileID: 2800000, guid: f185afb01ee091d44a86b3620bb93291, type: 3}
-    m_TargetAsset: {fileID: 2800000, guid: f185afb01ee091d44a86b3620bb93291, type: 3}
+    m_MainAsset: {fileID: 11400000, guid: c66c114ad23cfa747a9e77732ec6e5e3, type: 2}
+    m_TargetAsset: {fileID: 11400000, guid: c66c114ad23cfa747a9e77732ec6e5e3, type: 2}
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: 73ee212e6228b0645825250844d47e8c, type: 2}
   m_SchemaSet:

Assets/318153cee052596c.jpg.meta

@@ -0,0 +1,24 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 0}
+  m_Name: CardData
+  m_EditorClassIdentifier: GameLoop::CardData
+  cardUIInfos:
+  - type: 1
+    bg: {fileID: 21300000, guid: 603deb288ad665646b6ad9ee75015ac3, type: 3}
+    card: {fileID: 21300000, guid: 1f1dc217b0476ad41928e31d4ba6f443, type: 3}
+  - type: 2
+    bg: {fileID: 21300000, guid: f185afb01ee091d44a86b3620bb93291, type: 3}
+    card: {fileID: 21300000, guid: f3be387eb8a9f1f47a3289fbd91154fd, type: 3}
+  - type: 3
+    bg: {fileID: 21300000, guid: fba3c2ee578c687458c6f01510b2bd60, type: 3}
+    card: {fileID: 21300000, guid: b8604eb586c7cf14cafc83c50819839a, type: 3}

Assets/AddressableAssetsData/AssetGroups/Packed Assets.asset

@@ -166,6 +166,8 @@ GameObject:
   - component: {fileID: 8168149682860126925}
   - component: {fileID: 7668309135662431569}
   - component: {fileID: 7079307959043938564}
+  - component: {fileID: 2349720567290821599}
+  - component: {fileID: 1134859194859553482}
   m_Layer: 5
   m_Name: Frame
   m_TagString: Untagged
@@ -230,6 +232,92 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2349720567290821599
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2326876188459468341}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7a98125502f715b4b83cfb77b434e436, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 7079307959043938564}
+--- !u!114 &1134859194859553482
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2326876188459468341}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Delegates:
+  - eventID: 5
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 52645984628527603}
+          m_TargetAssemblyTypeName: CardUI, GameLoop
+          m_MethodName: OnMouseDrag
+          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
+  - eventID: 14
+    callback:
+      m_PersistentCalls:
+        m_Calls:
+        - m_Target: {fileID: 52645984628527603}
+          m_TargetAssemblyTypeName: CardUI, GameLoop
+          m_MethodName: OnMouseUp
+          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 &3327854443882546532
 GameObject:
   m_ObjectHideFlags: 0
@@ -264,7 +352,7 @@ RectTransform:
   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: -6.2839, y: -263}
+  m_AnchoredPosition: {x: -6.2839, y: -274}
   m_SizeDelta: {x: 331.4321, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2011178643818998382
@@ -473,6 +561,7 @@ GameObject:
   m_Component:
   - component: {fileID: 5746609830739648692}
   - component: {fileID: 52645984628527603}
+  - component: {fileID: 7416770972620502559}
   m_Layer: 5
   m_Name: Card
   m_TagString: Untagged
@@ -521,3 +610,23 @@ MonoBehaviour:
   captain: {fileID: 4359071618553640866}
   content: {fileID: 4931954737689858171}
   cost: {fileID: 6234272645867676071}
+--- !u!114 &7416770972620502559
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5746609830739648651}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 0
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1