Merge pull request '전투 화면 하단 카드 손패 UI + 5번 카드 이미지 적용' (#4) from feature/sts2-combat-layout into main

Reviewed-on: #4
2026-06-06 12:00:08 +09:00
parent c9ba86e264 6a049def85
commit 9bc1163103
8 changed files with 4180 additions and 2 deletions
--- a/RootDesk/MyDesk/invincible
+++ b/RootDesk/MyDesk/invincible
@@ -0,0 +1,23 @@
+{
+  "Id": "",
+  "GameId": "",
+  "EntryKey": "sprite://eab37efa7f0d400f94259a2df836eb8a",
+  "ContentType": "x-mod/sprite",
+  "Content": "",
+  "Usage": 0,
+  "UsePublish": 1,
+  "UseService": 0,
+  "CoreVersion": "26.5.0.0",
+  "StudioVersion": "0.1.0.0",
+  "DynamicLoading": 0,
+  "ContentProto": {
+    "Use": "Json",
+    "Json": {
+      "upload_keyname": "30/54/30542a379cb74d2d807104635740a8ea/sprite/eab37efa7f0d400f94259a2df836eb8a/639163110552472416",
+      "upload_hash": "AAD8C7C4E500FF8E001E85EAB181F3B19605BA9D8C8368DB28919B419515003D",
+      "name": "invincible belief",
+      "resource_guid": "eab37efa7f0d400f94259a2df836eb8a",
+      "resource_version": "6a238b0f1a7908d59b5d8fe4"
+    }
+  }
+}