From dd49917af9d6a16f42167e266a0c3f028f5fa15a Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 03 十一月 2025 10:52:33 +0800
Subject: [PATCH] 0312 icon表和图集提交
---
Sprite/4Interactable/guildnum2.png.meta | 2 +-
Sprite/6Decorate1/GuildSys_img_177.png.meta | 2 +-
Config/Icon.txt | 12 ++++++------
Sprite/4Interactable/guildnum1.png.meta | 2 +-
Config/Language.txt | 6 ++++++
Sprite/4Interactable.spriteatlasv2 | 6 ++++++
Sprite/4Interactable/arena_img_107.png.meta | 2 +-
Sprite/Guild.spriteatlasv2 | 12 ++++--------
Sprite/6Decorate1.spriteatlasv2 | 1 +
Sprite/Arena.spriteatlasv2 | 9 +++------
Sprite/4Interactable/arena_img_106.png.meta | 2 +-
Sprite/4Interactable/arena_img_105.png.meta | 2 +-
Sprite/4Interactable/guildnum3.png.meta | 2 +-
13 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/Config/Icon.txt b/Config/Icon.txt
index 60a91b4..4c41f51 100644
--- a/Config/Icon.txt
+++ b/Config/Icon.txt
@@ -216,18 +216,18 @@
ChallengeTab4 4Interactable challengetab_img_31
ChallengeTab5 4Interactable challengetab_img_32
ChallengeTab6 4Interactable challengetab_img_33
-guildnum1 Guild guildnum1
-guildnum2 Guild guildnum2
-guildnum3 Guild guildnum3
+guildnum1 4Interactable guildnum1
+guildnum2 4Interactable guildnum2
+guildnum3 4Interactable guildnum3
XMHZ_ST_1 Guild GuildSys_img_74
XMHZ_ST_3 Guild GuildSys_img_56
XMHZ_ST_4 Guild GuildSys_img_57
XMHZ_ST_6 Guild GuildSys_img_58
XMHZ_ST_2 Guild GuildSys_img_59
XMHZ_ST_5 Guild GuildSys_img_60
-Rank1 Arena arena_img_105
-Rank2 Arena arena_img_106
-Rank3 Arena arena_img_107
+Rank1 4Interactable arena_img_105
+Rank2 4Interactable arena_img_106
+Rank3 4Interactable arena_img_107
ArenaRecordTypeDef Arena arena_img_580
ArenaRecordTypeAtk Arena arena_img_581
GuildJob1 Guild GuideHall_img_110
diff --git a/Config/Language.txt b/Config/Language.txt
index 78ba775..bafde91 100644
--- a/Config/Language.txt
+++ b/Config/Language.txt
@@ -604,3 +604,9 @@
storename10 鍏細绛夌骇杈惧埌{0}绾цВ閿�
storename11 宸插敭缃�
storename12 鎷ユ湁锛歿0}
+DayMission1 浠诲姟
+DayMission2 姣忔棩浠诲姟
+DayMission3 姣忓懆濂栧姳
+DayMission4 鑻遍泟涔嬭矾
+DayMission5 娲昏穬搴�
+DayMission6 鍓嶅線
diff --git a/Sprite/4Interactable.spriteatlasv2 b/Sprite/4Interactable.spriteatlasv2
index 7598bc4..aa6c693 100644
--- a/Sprite/4Interactable.spriteatlasv2
+++ b/Sprite/4Interactable.spriteatlasv2
@@ -129,4 +129,10 @@
- {fileID: 2800000, guid: 06cc52e64a1e0344f95cb3f6972add0b, type: 3}
- {fileID: 2800000, guid: fc524eb0e4fbc8440ac9ac0e801d9dd4, type: 3}
- {fileID: 2800000, guid: 645af161139b3ed45bd87ac53c586f87, type: 3}
+ - {fileID: 2800000, guid: 5185205dc2cae474fb89bdbc8dfda429, type: 3}
+ - {fileID: 2800000, guid: 3379192efcdbadd4295e932cc374f386, type: 3}
+ - {fileID: 2800000, guid: 361acee5f9a28c544b83b2292e2e5a0c, type: 3}
+ - {fileID: 2800000, guid: 7610863cafaf9b547a29459f0285078d, type: 3}
+ - {fileID: 2800000, guid: c4647ad3c39111340adc970e015bb4e8, type: 3}
+ - {fileID: 2800000, guid: 8ef513e56d3884647b3b45286ab90fd7, type: 3}
m_IsVariant: 0
diff --git a/Sprite/4Interactable/arena_img_105.png.meta b/Sprite/4Interactable/arena_img_105.png.meta
index e0abd3d..dbc9f4c 100644
--- a/Sprite/4Interactable/arena_img_105.png.meta
+++ b/Sprite/4Interactable/arena_img_105.png.meta
@@ -123,5 +123,5 @@
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
- assetBundleName: ui/sprite/arena
+ assetBundleName: ui/sprite/4interactable
assetBundleVariant:
diff --git a/Sprite/4Interactable/arena_img_106.png.meta b/Sprite/4Interactable/arena_img_106.png.meta
index c4592a6..131c176 100644
--- a/Sprite/4Interactable/arena_img_106.png.meta
+++ b/Sprite/4Interactable/arena_img_106.png.meta
@@ -123,5 +123,5 @@
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
- assetBundleName: ui/sprite/arena
+ assetBundleName: ui/sprite/4interactable
assetBundleVariant:
diff --git a/Sprite/4Interactable/arena_img_107.png.meta b/Sprite/4Interactable/arena_img_107.png.meta
index 020a16d..4b12fdd 100644
--- a/Sprite/4Interactable/arena_img_107.png.meta
+++ b/Sprite/4Interactable/arena_img_107.png.meta
@@ -123,5 +123,5 @@
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
- assetBundleName: ui/sprite/arena
+ assetBundleName: ui/sprite/4interactable
assetBundleVariant:
diff --git a/Sprite/4Interactable/guildnum1.png.meta b/Sprite/4Interactable/guildnum1.png.meta
index ce0cc62..1fe9f31 100644
--- a/Sprite/4Interactable/guildnum1.png.meta
+++ b/Sprite/4Interactable/guildnum1.png.meta
@@ -123,5 +123,5 @@
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
- assetBundleName: ui/sprite/guild
+ assetBundleName: ui/sprite/4interactable
assetBundleVariant:
diff --git a/Sprite/4Interactable/guildnum2.png.meta b/Sprite/4Interactable/guildnum2.png.meta
index 1947689..48fb865 100644
--- a/Sprite/4Interactable/guildnum2.png.meta
+++ b/Sprite/4Interactable/guildnum2.png.meta
@@ -123,5 +123,5 @@
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
- assetBundleName: ui/sprite/guild
+ assetBundleName: ui/sprite/4interactable
assetBundleVariant:
diff --git a/Sprite/4Interactable/guildnum3.png.meta b/Sprite/4Interactable/guildnum3.png.meta
index aafe367..26d90e2 100644
--- a/Sprite/4Interactable/guildnum3.png.meta
+++ b/Sprite/4Interactable/guildnum3.png.meta
@@ -123,5 +123,5 @@
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
- assetBundleName: ui/sprite/guild
+ assetBundleName: ui/sprite/4interactable
assetBundleVariant:
diff --git a/Sprite/6Decorate1.spriteatlasv2 b/Sprite/6Decorate1.spriteatlasv2
index 5069dd4..d6f6193 100644
--- a/Sprite/6Decorate1.spriteatlasv2
+++ b/Sprite/6Decorate1.spriteatlasv2
@@ -21,4 +21,5 @@
- {fileID: 2800000, guid: 9db491b62f1d9944c9533619dea0289e, type: 3}
- {fileID: 2800000, guid: 094adaea1cca8de43876891208c2578f, type: 3}
- {fileID: 2800000, guid: eb157788b45f0d04492944098cfa6f37, type: 3}
+ - {fileID: 2800000, guid: 4cf2c34910afa5842986460ef3700217, type: 3}
m_IsVariant: 0
diff --git a/Sprite/6Decorate1/GuildSys_img_177.png.meta b/Sprite/6Decorate1/GuildSys_img_177.png.meta
index 226b423..7c9c03d 100644
--- a/Sprite/6Decorate1/GuildSys_img_177.png.meta
+++ b/Sprite/6Decorate1/GuildSys_img_177.png.meta
@@ -123,5 +123,5 @@
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
- assetBundleName: ui/sprite/guild
+ assetBundleName: ui/sprite/6decorate1
assetBundleVariant:
diff --git a/Sprite/Arena.spriteatlasv2 b/Sprite/Arena.spriteatlasv2
index e0b89bd..b7710c9 100644
--- a/Sprite/Arena.spriteatlasv2
+++ b/Sprite/Arena.spriteatlasv2
@@ -11,9 +11,9 @@
m_MasterAtlas: {fileID: 0}
m_ImporterData:
packables:
- - {fileID: 2800000, guid: 5185205dc2cae474fb89bdbc8dfda429, type: 3}
- - {fileID: 2800000, guid: 3379192efcdbadd4295e932cc374f386, type: 3}
- - {fileID: 2800000, guid: 361acee5f9a28c544b83b2292e2e5a0c, type: 3}
+ - {fileID: 2800000, guid: 7e47c8f16a0dd7348964ce5b84234ba6, type: 3}
+ - {fileID: 2800000, guid: 7d7582d98e6de4b4eb44f2bff37cef1d, type: 3}
+ - {fileID: 2800000, guid: d2122d12d4c5db14cb5cedb7db42dab3, type: 3}
- {fileID: 2800000, guid: 0b7d438bc3aaaa545a4883d90eb5db79, type: 3}
- {fileID: 2800000, guid: cdfc130190807244980ff3236bab40c0, type: 3}
- {fileID: 2800000, guid: fcd97b7418fdf6742807c04182d846bc, type: 3}
@@ -43,7 +43,4 @@
- {fileID: 2800000, guid: 1d302c72053da9d4dbd776ef2343e61e, type: 3}
- {fileID: 2800000, guid: b83a50e4de5e10e46a3ff3ba482c1a13, type: 3}
- {fileID: 2800000, guid: 162d9e5d69f46354c8851ac794a5781c, type: 3}
- - {fileID: 2800000, guid: d2122d12d4c5db14cb5cedb7db42dab3, type: 3}
- - {fileID: 2800000, guid: 7d7582d98e6de4b4eb44f2bff37cef1d, type: 3}
- - {fileID: 2800000, guid: 7e47c8f16a0dd7348964ce5b84234ba6, type: 3}
m_IsVariant: 0
diff --git a/Sprite/Guild.spriteatlasv2 b/Sprite/Guild.spriteatlasv2
index a8c84b0..24895d9 100644
--- a/Sprite/Guild.spriteatlasv2
+++ b/Sprite/Guild.spriteatlasv2
@@ -11,9 +11,9 @@
m_MasterAtlas: {fileID: 0}
m_ImporterData:
packables:
- - {fileID: 2800000, guid: 7610863cafaf9b547a29459f0285078d, type: 3}
- - {fileID: 2800000, guid: c4647ad3c39111340adc970e015bb4e8, type: 3}
- - {fileID: 2800000, guid: 8ef513e56d3884647b3b45286ab90fd7, type: 3}
+ - {fileID: 2800000, guid: 806bdff7f50b75341aae83548a7c082c, type: 3}
+ - {fileID: 2800000, guid: 541723512aa6e614fa0184c664fb2c5b, type: 3}
+ - {fileID: 2800000, guid: dfa225bdd33a93c4eafc362bea5c9dfb, type: 3}
- {fileID: 2800000, guid: 7d7846e5817cbbb4483c4ff7cde9a787, type: 3}
- {fileID: 2800000, guid: b76ed3da57d0dab4187ac81d53436a18, type: 3}
- {fileID: 2800000, guid: 0a7392fec31fddd46a5f8c4d7c7422b4, type: 3}
@@ -22,7 +22,7 @@
- {fileID: 2800000, guid: b3aad1c20c5a9d44283ebd457def70d3, type: 3}
- {fileID: 2800000, guid: bd99741cc2094aa4f9f724260333f319, type: 3}
- {fileID: 2800000, guid: 07820daa05654b24795d376151b9216b, type: 3}
- - {fileID: 2800000, guid: 4cf2c34910afa5842986460ef3700217, type: 3}
+ - {fileID: 2800000, guid: dd0826bad41d12842b75a3a22f76eb02, type: 3}
- {fileID: 2800000, guid: 467d13240857f9f479f4c59b123a03a1, type: 3}
- {fileID: 2800000, guid: 76694488e58083e4bb9a761246c82783, type: 3}
- {fileID: 2800000, guid: b93e5b96b8160484ca1ca2a00d3b89a7, type: 3}
@@ -77,8 +77,4 @@
- {fileID: 2800000, guid: d4a2555f1ebf58f4a8bee0a6a5d5bf99, type: 3}
- {fileID: 2800000, guid: 6398024895b37fd48bccfa995bfcba65, type: 3}
- {fileID: 2800000, guid: d96103865969c684aacc8199a3d9bac6, type: 3}
- - {fileID: 2800000, guid: dd0826bad41d12842b75a3a22f76eb02, type: 3}
- - {fileID: 2800000, guid: dfa225bdd33a93c4eafc362bea5c9dfb, type: 3}
- - {fileID: 2800000, guid: 541723512aa6e614fa0184c664fb2c5b, type: 3}
- - {fileID: 2800000, guid: 806bdff7f50b75341aae83548a7c082c, type: 3}
m_IsVariant: 0
--
Gitblit v1.8.0