테이블 추가

Assets/ResWork/Table.meta

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

Assets/ResWork/Table/Export.meta

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

Assets/ResWork/Table/Export/Attandance.json

@@ -0,0 +1 @@
+[{"n_Day": "1", "n_GachaAmount": "10"}, {"n_Day": "2", "n_GachaAmount": "20"}, {"n_Day": "3", "n_GachaAmount": "30"}, {"n_Day": "4", "n_GachaAmount": "40"}, {"n_Day": "5", "n_GachaAmount": "50"}, {"n_Day": "6", "n_GachaAmount": "60"}, {"n_Day": "7", "n_GachaAmount": "70"}]

Assets/ResWork/Table/Export/Attandance.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 528bbab55b4380240b80948314c390b4
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ResWork/Table/Export/Tables.prefab

@@ -0,0 +1,60 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4255407216469596348
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6985437972318410646}
+  - component: {fileID: 443064579891176611}
+  - component: {fileID: 4248464231039979418}
+  m_Layer: 0
+  m_Name: Tables
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6985437972318410646
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4255407216469596348}
+  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: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &443064579891176611
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4255407216469596348}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cdec1cb34eb263d4e8faa876b9eece82, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &4248464231039979418
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4255407216469596348}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1e7f8bf723d0bbc4cb48d1be5adeda32, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_json: {fileID: 4900000, guid: 528bbab55b4380240b80948314c390b4, type: 3}

Assets/ResWork/Table/Export/Tables.prefab.meta

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

Assets/ResWork/Table/SheGotWet.xlsm.meta

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

Assets/ResWork/Table/TableChecker.cs

@@ -0,0 +1,21 @@
+public class TableChecker : MonoBehaviourSingletonTemplate<TableChecker>
+{
+    table_base[] tables;
+
+    protected override void Awake()
+    {
+        base.Awake();
+        DontDestroy();
+        tables = GetComponents<table_base>();
+    }
+
+    public bool CheckAllLoad()
+    {
+        for (int i = 0; i < tables.Length; i++)
+        {
+            if (!tables[i].Get_LoadComplete())
+                return false;
+        }
+        return true;
+    }
+}

Assets/ResWork/Table/TableChecker.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: cdec1cb34eb263d4e8faa876b9eece82

Assets/ResWork/Table/table_attandance.cs

@@ -0,0 +1,31 @@
+using GUPS.AntiCheat.Protected;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+public class attandancetabledata
+{
+    ProtectedInt32 _Day; public int n_Day { get { return _Day; } set { _Day = value; _Day.Obfuscate(); } }
+    ProtectedInt32 _GachaAmount; public int n_GachaAmount { get { return _GachaAmount; } set { _GachaAmount = value; _GachaAmount.Obfuscate(); } }
+}
+
+public class table_attandance : table_base
+{
+    public static table_attandance Ins;
+
+    List<attandancetabledata> tableDatas;
+
+    protected override void Awake()
+    {
+        Ins = this;
+        base.Awake();
+    }
+
+    protected override void Start()
+    {
+        tableDatas = JsonConvert.DeserializeObject<List<attandancetabledata>>(json_last);
+        base.Start();
+    }
+
+    public List<attandancetabledata> Get_DataList() { return tableDatas; }
+    public attandancetabledata Get_Data(int day) { return Get_DataList().Find(f=>f.n_Day == day); }
+}

Assets/ResWork/Table/table_attandance.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1e7f8bf723d0bbc4cb48d1be5adeda32

Assets/ResWork/Table/table_base.cs

@@ -0,0 +1,18 @@
+using UnityEngine;
+
+public class table_base : MonoBehaviour
+{
+    public TextAsset m_json;
+
+    protected string json_last;
+    protected bool LoadComplete = false;
+
+    protected virtual void Awake()
+    {
+        json_last = m_json.text;
+        Resources.UnloadAsset(m_json);
+        m_json = null;
+    }
+    protected virtual void Start() { LoadComplete = true; }
+    public bool Get_LoadComplete() { return LoadComplete; }
+}

Assets/ResWork/Table/table_base.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a7e35c62f6ab7124ba3e270561c51382

Assets/Scenes/SampleScene.unity

@@ -356,6 +356,63 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 168358557}
   m_CullTransparentMesh: 1
+--- !u!1001 &201009777
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4255407216469596348, guid: d817dcdfd0c7ca244818b159756c50d5, type: 3}
+      propertyPath: m_Name
+      value: Tables
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985437972318410646, guid: d817dcdfd0c7ca244818b159756c50d5, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985437972318410646, guid: d817dcdfd0c7ca244818b159756c50d5, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985437972318410646, guid: d817dcdfd0c7ca244818b159756c50d5, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985437972318410646, guid: d817dcdfd0c7ca244818b159756c50d5, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985437972318410646, guid: d817dcdfd0c7ca244818b159756c50d5, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985437972318410646, guid: d817dcdfd0c7ca244818b159756c50d5, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985437972318410646, guid: d817dcdfd0c7ca244818b159756c50d5, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985437972318410646, guid: d817dcdfd0c7ca244818b159756c50d5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985437972318410646, guid: d817dcdfd0c7ca244818b159756c50d5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6985437972318410646, guid: d817dcdfd0c7ca244818b159756c50d5, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: d817dcdfd0c7ca244818b159756c50d5, type: 3}
 --- !u!1 &240605635
 GameObject:
   m_ObjectHideFlags: 0
@@ -3081,7 +3138,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0c6d64701142b344eb1c16d3f22b7a69, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  label_version: {fileID: 0}
   label_msg: {fileID: 1178730386}
   t_ver: {fileID: 989474289}
 --- !u!1 &1483615883
@@ -4889,3 +4945,4 @@ SceneRoots:
   - {fileID: 456601672}
   - {fileID: 37909579}
   - {fileID: 500962023}
+  - {fileID: 201009777}

Assets/Scripts/Title/TitleInfo.cs

@@ -16,15 +16,14 @@ public class TitleInfo : MyCoroutine
     IEnumerator Start()
     {
         t_ver.text = DSUtil.Format("{0}({1})", Application.version, "E or G or O");
-        label_msg.text = "";
+        label_msg.text = "게임 데이터를 읽고 있습니다.";
 
-        // TODO 정인호 : 테이블 로드
+        // 테이블 로딩 기다리기
-        //// 테이블 로딩 기다리기
+        while (!TableChecker.Ins.CheckAllLoad()) yield return null;
-        //while (!TableChecker.Ins.CheckAllLoad()) yield return null;
-        //label_msg.text = table_localtext.Ins.Get_Text(1);
         // UI 아틀라스 로드
         yield return AddrResourceMgr.Ins.LoadObjectSequential<SpriteAtlas>("MainUI/UIAtlas.spriteatlasv2", atlas => { UIAtlasMgr.Ins.Set(atlas); });
 
+        label_msg.text = "로비로 진입 중입니다.";
         yield return null;
 
         //#if FGB_LIVE