From eec61e0e28b13ed2a45f036b95f9478b7f2c937c Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期五, 05 九月 2025 15:31:47 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
UI/MainWin.prefab | 64 ++++++++++++++++++++++++++++++++
Config/FuncOpenLV.txt | 5 ++
Config/DamageNum.txt | 26 ++++++------
3 files changed, 81 insertions(+), 14 deletions(-)
diff --git a/Config/DamageNum.txt b/Config/DamageNum.txt
index 61097d3..ceff6b0 100644
--- a/Config/DamageNum.txt
+++ b/Config/DamageNum.txt
@@ -1,16 +1,16 @@
int string int int int int[]
TypeID id prefix plus minus nums
绫诲瀷ID 椋樿绫诲瀷 鍓嶇紑 鍔犲彿 鍑忓彿 鏁板瓧
-2 Damage 45 48|49|50|51|52|53|54|55|56|57|46|107|109|98|116
-4 Recovery 295 280|281|282|283|284|285|286|287|288|289|290|291|292|293|294
-8 Reflect 257 256 240|241|242|243|244|245|246|247|248|249|250|251|252|253|254
-16 Bloody 236 220|221|222|223|224|225|226|227|228|229|230|231|232|233|234
-32 Block 277 260|261|262|263|264|265|266|267|268|269|270|271|272|273|274
-64 Critical 217 216 200|201|202|203|204|205|206|207|208|209|210|211|212|213|214
-66 217 216 200|201|202|203|204|205|206|207|208|209|210|211|212|213|214
-68
-1088
-128 Dodge 303
-256 RageUp 337 335 320|321|322|323|324|325|326|327|328|329|330|331|332|333|334
-512
-1024
+1 Damage 45 48|49|50|51|52|53|54|55|56|57|46|107|109|98|116
+2 Recovery 295 280|281|282|283|284|285|286|287|288|289|290|291|292|293|294
+4 Reflect 257 256 240|241|242|243|244|245|246|247|248|249|250|251|252|253|254
+8 Bloody 237 236 220|221|222|223|224|225|226|227|228|229|230|231|232|233|234
+16 Block 277 260|261|262|263|264|265|266|267|268|269|270|271|272|273|274
+32 Critical
+33 217 216 200|201|202|203|204|205|206|207|208|209|210|211|212|213|214
+34 298 295 280|281|282|283|284|285|286|287|288|289|290|291|292|293|294
+544 358 356 340|341|342|343|344|345|346|347|348|349|350|351|352|353|354
+64 Dodge 303
+128 RageUp 337 335 320|321|322|323|324|325|326|327|328|329|330|331|332|333|334
+256 297 295 280|281|282|283|284|285|286|287|288|289|290|291|292|293|294
+512 357 356 340|341|342|343|344|345|346|347|348|349|350|351|352|353|354
diff --git a/Config/FuncOpenLV.txt b/Config/FuncOpenLV.txt
index eec40db..c0eaedc 100644
--- a/Config/FuncOpenLV.txt
+++ b/Config/FuncOpenLV.txt
@@ -1,6 +1,9 @@
int int int int int string string string Dictionary<int, int[][]>
FuncId LimitLV LimiRealmLV LimitMissionID OpenDay Name Desc Icon Award
鍔熻兘缂栧彿(鍞竴) 闄愬埗绛夌骇(鍏ㄥ眬) 闇�瑕佸畼鑱岀瓑绾� 闇�瑕佸畬鎴愮殑鏂颁换鍔D 寮�鏈嶇鍑犲ぉ寮�鍚� 鍔熻兘鍚� 鍔熻兘璇存槑 瀵瑰簲ICON 濂栧姳
+1 0 0 1001 姝﹀皢 JingJieIcon_a {"1":[[20,50]],"2":[[20,50]]}
+2 0 0 1002 鎸戞垬 JingJieIcon_a {"1":[[20,50]],"2":[[20,50]]}
+3 0 0 1003 鍐呮斂 JingJieIcon_a {"1":[[20,50]],"2":[[20,50]]}
12 1 0 0 瀹樿亴 JingJieIcon_a {"1":[[20,50]],"2":[[20,50]]}
15 0 0 1010 浠欑洘 MengIcon_a
72 50 0 0 鎺掕姒� RankIcon_a
@@ -8,7 +11,7 @@
78 0 0 1020 鏃ュ父 DailyIcon_a
79 0 0 1030 鍟嗗煄 Shopping
81 35 0 0 绛惧埌 FuLiIcon_a
-99 1 0 0 姝﹀皢鎷涘嫙 TY_GN_XB
+99 0 0 1001 姝﹀皢鎷涘嫙 TY_GN_XB
102 20 0 0 鑱婂ぉ
108 0 0 1003 鑷姩鎸傛満
110 3 0 0 棣栧厖
diff --git a/UI/MainWin.prefab b/UI/MainWin.prefab
index 5778acf..c9f9ef6 100644
--- a/UI/MainWin.prefab
+++ b/UI/MainWin.prefab
@@ -657,6 +657,7 @@
m_Component:
- component: {fileID: 6503876796182867109}
- component: {fileID: 3982763767658949635}
+ - component: {fileID: 9089164809760579230}
m_Layer: 5
m_Name: ChallengeBtn
m_TagString: Untagged
@@ -742,6 +743,21 @@
m_UnSelectIcon: {fileID: 0}
m_Title: {fileID: 0}
m_SelectEffect: {fileID: 0}
+--- !u!114 &9089164809760579230
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1719726509085866172}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe467017cf4c98749ae675c385c32352, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ funcOpenKey: 2
+ LockImg: {fileID: 0}
+ active: 1
--- !u!1 &2033563431573273982
GameObject:
m_ObjectHideFlags: 0
@@ -1054,6 +1070,7 @@
m_Component:
- component: {fileID: 6147220740440022312}
- component: {fileID: 6939125777360479798}
+ - component: {fileID: 8184474397353319248}
m_Layer: 5
m_Name: AffairsBtn
m_TagString: Untagged
@@ -1139,6 +1156,21 @@
m_UnSelectIcon: {fileID: 0}
m_Title: {fileID: 0}
m_SelectEffect: {fileID: 0}
+--- !u!114 &8184474397353319248
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2257509742303827216}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe467017cf4c98749ae675c385c32352, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ funcOpenKey: 3
+ LockImg: {fileID: 0}
+ active: 1
--- !u!1 &2516881800495134545
GameObject:
m_ObjectHideFlags: 0
@@ -2793,6 +2825,7 @@
m_Component:
- component: {fileID: 3848824862231699322}
- component: {fileID: 324760886333781827}
+ - component: {fileID: 3323636711823378378}
m_Layer: 5
m_Name: HerosBtn
m_TagString: Untagged
@@ -2878,6 +2911,21 @@
m_UnSelectIcon: {fileID: 0}
m_Title: {fileID: 0}
m_SelectEffect: {fileID: 0}
+--- !u!114 &3323636711823378378
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 4641151293928831641}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe467017cf4c98749ae675c385c32352, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ funcOpenKey: 1
+ LockImg: {fileID: 0}
+ active: 1
--- !u!1 &4643883219516223968
GameObject:
m_ObjectHideFlags: 0
@@ -5555,6 +5603,7 @@
m_Component:
- component: {fileID: 1204140045060838182}
- component: {fileID: 95356822548520512}
+ - component: {fileID: 7615314078013537970}
m_Layer: 5
m_Name: GuildBtn
m_TagString: Untagged
@@ -5640,6 +5689,21 @@
m_UnSelectIcon: {fileID: 0}
m_Title: {fileID: 0}
m_SelectEffect: {fileID: 0}
+--- !u!114 &7615314078013537970
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 7931155928514795810}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe467017cf4c98749ae675c385c32352, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ funcOpenKey: 15
+ LockImg: {fileID: 0}
+ active: 1
--- !u!1 &8067560578187247188
GameObject:
m_ObjectHideFlags: 0
--
Gitblit v1.8.0