Game Beta V0.5.1 (Touch controls system Update)

Assets/Character&UI/MainCharacter/Character.prefab

@@ -760,7 +760,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: 0
-  m_SortingOrder: 3
+  m_SortingOrder: 2
   m_TargetDisplay: 0
 --- !u!114 &4200517667925857246
 MonoBehaviour:
@@ -2571,11 +2571,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 723
+      value: -600
       objectReference: {fileID: 0}
     - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3}
       propertyPath: m_SizeDelta.y
-      value: 318.31323
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3}
       propertyPath: m_LocalScale.x
@@ -2619,11 +2619,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0.000061035156
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.000030517578
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8170153791668043268, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -2641,6 +2641,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Movement_Joystick
       objectReference: {fileID: 0}
+    - target: {fileID: 8170153791668043270, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3}
+      propertyPath: m_CullTransparentMesh
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 0d230cc8be529a542a08cb878ab14b18, type: 3}
 --- !u!224 &4570208839654163961 stripped
@@ -8893,6 +8897,30 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 3835056961732624643, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3835056961732624643, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3835056961732624643, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3835056961732624643, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3835056961732624643, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3835056961732624643, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4259282210437424883, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
       propertyPath: m_RootOrder
       value: 0
@@ -8937,6 +8965,30 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6949911993730944467, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6949911993730944467, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6949911993730944467, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6949911993730944467, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6949911993730944467, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6949911993730944467, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7087931352518617960, guid: afefacff96f16064ca0bca0a2b879d61, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0

Assets/Character&UI/UI/List_Item_Widget.prefab

@@ -152,7 +152,7 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: 0
-  m_SortingOrder: 3
+  m_SortingOrder: 5
   m_TargetDisplay: 0
 --- !u!114 &564613375114771634
 MonoBehaviour:
@@ -166,10 +166,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_UiScaleMode: 0
-  m_ReferencePixelsPerUnit: 100
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 72
   m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
+  m_ReferenceResolution: {x: 1280, y: 720}
   m_ScreenMatchMode: 0
   m_MatchWidthOrHeight: 0
   m_PhysicalUnit: 3

Assets/Character&UI/UI/Select_List_Element.prefab

@@ -497,6 +497,7 @@ RectTransform:
   - {fileID: 5028168278870018830}
   - {fileID: 37215461069841189}
   - {fileID: 675273744905987167}
+  - {fileID: 8992938074224788875}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -518,12 +519,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   itemData:
+    Item_Index: 0
     Name: 
     Number: 0
     itemSprite: {fileID: 0}
     IsEquip: 0
     Index: 0
-    Owner: {fileID: 0}
+    ItemPrefeb: {fileID: 0}
+    useItemMode: 0
   IndexEquip: 0
 --- !u!95 &2361794046123494800
 Animator:
@@ -545,6 +548,139 @@ Animator:
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
+--- !u!1 &4227458316470112265
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8992938074224788875}
+  - component: {fileID: 4940817272944506658}
+  - component: {fileID: 4868348320038515111}
+  - component: {fileID: 3199036338371604880}
+  m_Layer: 5
+  m_Name: Item_Button
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8992938074224788875
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4227458316470112265}
+  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: []
+  m_Father: {fileID: 1954177926229671675}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 38.5}
+  m_SizeDelta: {x: 77, y: 77}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4940817272944506658
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4227458316470112265}
+  m_CullTransparentMesh: 1
+--- !u!114 &4868348320038515111
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4227458316470112265}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3199036338371604880
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4227458316470112265}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, 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: 1
+  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: 4868348320038515111}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 2124475740685663846}
+        m_TargetAssemblyTypeName: Equip_Item_List_System, Assembly-CSharp
+        m_MethodName: Touch_Select_Item
+        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 &5666027221385338206
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scenes_Assets/3DAsset/Ghost_AttackObject.prefab

@@ -31,8 +31,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1793019610661123709}
-  m_LocalRotation: {x: 0, y: 0, z: -0.5191413, w: 0.8546884}
-  m_LocalPosition: {x: 37.282043, y: 1.2729656, z: -0.17694937}
+  m_LocalRotation: {x: 0, y: 0, z: -0.62942976, w: 0.7770574}
+  m_LocalPosition: {x: 35.96713, y: 0.9942825, z: -0.9978251}
   m_LocalScale: {x: 0.5, y: 0.5, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/Scenes_Assets/3DAsset/Holy_Water.prefab

@@ -31,8 +31,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1793019610661123709}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 52.850956, y: 4.018526, z: -1.1577194}
+  m_LocalRotation: {x: -0, y: 0, z: -0.22578649, w: 0.9741768}
+  m_LocalPosition: {x: 45.0658, y: 1.8381754, z: -0.098816745}
   m_LocalScale: {x: 0.5, y: 0.5, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/Script/C_Sharp/Character_System/Add_item_to_character.cs

@@ -86,7 +86,7 @@ void OnTriggerEnter(Collider other)
         if (other.gameObject.tag == "Player" && !IsSpawn)
         {
             other.gameObject.GetComponent<Inventory_System>().Add_Item_Element(itemData);
-            Destroy(this.gameObject);
+            Destroy(gameObject);
             print("Adddddd-----------------------");
         }
 

Assets/Script/C_Sharp/Character_System/Inventory_System.cs

@@ -300,21 +300,36 @@ public void Set_Inventory_Info(Structs_Libraly.Item_Data itemData)
     }
 
     //촛볶瑄勒▽昆려
-    void Select_Number_List(int Number)
+    public void Select_Number_List(int Number, bool select_for_touch = false, int select_number = 0)
     {
         if (GameInstance.ShowItemElementData.Count > 0)
         {
-            SelectNum += Number;
-            if (SelectNum > maxSelect)
+            if (!select_for_touch)
             {
-                SelectNum = 0;
+                SelectNum += Number;
+                if (SelectNum > maxSelect)
+                {
+                    SelectNum = 0;
+                }
+                else if (SelectNum < 0)
+                {
+                    SelectNum = maxSelect;
+                }
+                IsAim = false;
             }
-            else if (SelectNum < 0)
+            else
             {
-                SelectNum = maxSelect;
+                if(SelectNum == select_number)
+                {
+                    Aim(!IsAim);
+                    print(SelectNum + " Num : Sel " + select_number + " ISaIM : " + IsAim);
+                } else
+                {
+                    IsAim = false;
+                }
+                SelectNum = select_number;
             }
 
-            IsAim = false;
             //print("Select is : " + SelectNum);
             Equip_Element_list[SelectNum].GetComponent<Animator>().SetBool("Is_Play?", true);
 
@@ -379,14 +394,14 @@ public void Aim(bool is_Aim)
         }
     }
 
-    public void Use_Item_Equip()
+    public void Use_Item_Equip(bool is_remove = false)
     {
         if (GameInstance.ShowItemElementData.Count > 0)
         {
             Structs_Libraly.Item_Data itemData = Equip_Element_list[SelectNum].GetComponent<Equip_Item_List_System>().itemData;
 
             if (itemData.useItemMode != Use_Item_System.Shoot_Projectile)
-                gameObject.GetComponent<Item_System>().Use_Item(itemData.useItemMode, itemData.ItemPrefeb, IsAim);
+                GetComponent<Item_System>().Use_Item(itemData.useItemMode, itemData.ItemPrefeb, IsAim);
         }
     }
 

Assets/Script/C_Sharp/Character_System/Player_Movement.cs

@@ -399,6 +399,7 @@ public void Touch_Interact_Button()
         }
     }
 
+    //»ØèÁÊÑÁ¼ÑÊ - ¡´à»Ô´ªèͧà¡çº¢Í§
     public void Touch_OpenInventoryUi()
     {
         gameObject.GetComponent<Inventory_System>().Set_Inventory_Element();