From ecf6ffe2ecbd73cd9e666c494d8fde4fc2cd545f Mon Sep 17 00:00:00 2001
From: gwj <379014410@qq.com>
Date: 星期六, 11 十月 2025 20:29:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
UI/MainWin.prefab | 2
Config/FuncOpenLV.txt | 65 ++++++++++++++++----------------
Config/Guide.txt | 4 +-
UI/AffairBaseWin.prefab | 14 +++---
UI/NewBieWin.prefab | 12 +++---
5 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/Config/FuncOpenLV.txt b/Config/FuncOpenLV.txt
index d05f02c..3d7ee62 100644
--- a/Config/FuncOpenLV.txt
+++ b/Config/FuncOpenLV.txt
@@ -1,32 +1,33 @@
-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 姝﹀皢 Func_Hero {"1":[[20,50]],"2":[[20,50]]}
-2 0 0 1002 鎸戞垬 Func_Challenge {"1":[[20,50]],"2":[[20,50]]}
-3 0 0 1001 鍐呮斂 Func_Affair {"1":[[20,50]],"2":[[20,50]]}
-4 100 0 鐏靛吔 Func_Pet
-5 100 0 搴滈偢
-6 100 0 鐨囧
-7 100 0 绾㈤
-8 0 0 1001 娣橀噾
-9 0 0 1040 鐧介鐩堥噹
-12 1 0 0 瀹樿亴
-15 0 0 1010 鍏細
-72 50 0 0 鎺掕姒�
-75 0 0 0 鍚堟垚
-78 0 0 1020 鏃ュ父
-79 0 0 1030 鍟嗗煄
-81 35 0 0 绛惧埌
-99 0 0 1001 姝﹀皢鎷涘嫙
-102 20 0 0 鑱婂ぉ
-108 0 0 1003 鑷姩鎸傛満
-110 3 0 0 棣栧厖
-113 3 0 0 鍏呭��
-115 46 0 0 涓冨ぉ鐧婚檰濂栧姳
-116 60 0 0 绛夌骇绀煎寘
-119 58 0 0 鏈堝崱
-185 50 0 0 姣忔棩绀煎寘
-195 0 0 1040 绔炴妧鍦�
-214 106 0 0 鍙ゅ疂
-215 0 0 0 鎴愬氨
-236 1 0 0 骞诲闃�
+int int int int int int string string string Dictionary<int, int[][]>
+FuncId LimitLV LimiRealmLV BlessLV LimitMissionID OpenDay Name Desc Icon Award
+鍔熻兘缂栧彿(鍞竴) 闄愬埗绛夌骇(鍏ㄥ眬) 闇�瑕佸畼鑱岀瓑绾� 绁濈绛夌骇 闇�瑕佸畬鎴愮殑鏂颁换鍔D 寮�鏈嶇鍑犲ぉ寮�鍚� 鍔熻兘鍚� 鍔熻兘璇存槑 瀵瑰簲ICON 濂栧姳
+1 0 0 1001 姝﹀皢 Func_Hero {"1":[[20,50]],"2":[[20,50]]}
+2 0 0 1002 鎸戞垬 Func_Challenge {"1":[[20,50]],"2":[[20,50]]}
+3 0 0 1001 鍐呮斂 Func_Affair {"1":[[20,50]],"2":[[20,50]]}
+4 100 0 鐏靛吔 Func_Pet
+5 100 0 搴滈偢
+6 100 0 鐨囧
+7 100 0 绾㈤
+8 0 0 1001 娣橀噾
+9 0 0 1040 鐧介鐩堥噹
+10 1 0 0 瀹樿亴
+11 0 0 1010 鍏細
+12 0 0 1002 绁濈绛夌骇
+13 50 0 0 鎺掕姒�
+14 0 0 0 鍚堟垚
+15 0 0 1020 鏃ュ父
+16 0 0 1030 鍟嗗煄
+17 35 0 0 绛惧埌
+18 0 0 1001 姝﹀皢鎷涘嫙
+19 20 0 0 鑱婂ぉ
+20 0 0 1003 鑷姩鎸傛満
+21 3 0 0 棣栧厖
+22 3 0 0 鍏呭��
+23 46 0 0 涓冨ぉ鐧婚檰濂栧姳
+24 60 0 0 绛夌骇绀煎寘
+25 58 0 0 鏈堝崱
+26 50 0 0 姣忔棩绀煎寘
+27 0 0 1040 绔炴妧鍦�
+28 106 0 0 鍙ゅ疂
+29 0 0 0 鎴愬氨
+30 1 0 0 骞诲闃�
diff --git a/Config/Guide.txt b/Config/Guide.txt
index 3d96a7a..61baf0f 100644
--- a/Config/Guide.txt
+++ b/Config/Guide.txt
@@ -9,11 +9,11 @@
6 5 0 0 MainBossEnterWin 5 [303]
7 3 10304 0 HomeWin [701,302]
8 5 0 0 MainBossEnterWin 7 [303]
-9 2 108 0 HomeWin [901,902]
+9 2 20 0 HomeWin [901,902]
10 5 0 0 AutoFightWin 9 [903]
11 1 1016 0 HomeWin [1101]
12 5 0 0 OfficialUpWin 11 [1102]
-13 2 108 0 HomeWin [1301,1302]
+13 2 12 0 HomeWin [1301,1302]
14 5 0 0 BlessLVWin 13 [1303,1304]
15 5 0 0 BlessLVTimeUpWin 14 [1305]
16 2 1 0 HomeWin [1601,1602,1603]
diff --git a/UI/AffairBaseWin.prefab b/UI/AffairBaseWin.prefab
index 9334045..c7b8dd6 100644
--- a/UI/AffairBaseWin.prefab
+++ b/UI/AffairBaseWin.prefab
@@ -1793,7 +1793,7 @@
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 96.5, y: -24}
- m_SizeDelta: {x: 0, y: 36}
+ m_SizeDelta: {x: 48, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4530212228958140923
CanvasRenderer:
@@ -9329,7 +9329,7 @@
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 96.5, y: -24}
- m_SizeDelta: {x: 0, y: 36}
+ m_SizeDelta: {x: 96, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &161398467147966509
CanvasRenderer:
@@ -10340,7 +10340,7 @@
titleBG: {fileID: 5641343848358299163}
titleText: {fileID: 3232726904849564015}
funcBtn: {fileID: 229645164512380942}
- funcID: 236
+ funcID: 30
--- !u!1 &2709421448402734413
GameObject:
m_ObjectHideFlags: 0
@@ -11058,7 +11058,7 @@
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 96.5, y: -24}
- m_SizeDelta: {x: 0, y: 36}
+ m_SizeDelta: {x: 48, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6740642619635265717
CanvasRenderer:
@@ -19872,7 +19872,7 @@
titleBG: {fileID: 719817238946451257}
titleText: {fileID: 6447527770468284002}
funcBtn: {fileID: 2157415611165502500}
- funcID: 214
+ funcID: 28
--- !u!1 &5102110324325627338
GameObject:
m_ObjectHideFlags: 0
@@ -23252,7 +23252,7 @@
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 96.5, y: -24}
- m_SizeDelta: {x: 0, y: 36}
+ m_SizeDelta: {x: 48, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3864358970495494244
CanvasRenderer:
@@ -31739,7 +31739,7 @@
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 96.5, y: -24}
- m_SizeDelta: {x: 0, y: 36}
+ m_SizeDelta: {x: 48, y: 36}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6099040385931311863
CanvasRenderer:
diff --git a/UI/MainWin.prefab b/UI/MainWin.prefab
index 89079d4..5fbcc77 100644
--- a/UI/MainWin.prefab
+++ b/UI/MainWin.prefab
@@ -5821,7 +5821,7 @@
m_Script: {fileID: 11500000, guid: fe467017cf4c98749ae675c385c32352, type: 3}
m_Name:
m_EditorClassIdentifier:
- funcOpenKey: 15
+ funcOpenKey: 11
LockImg: {fileID: 0}
active: 1
--- !u!1 &8067560578187247188
diff --git a/UI/NewBieWin.prefab b/UI/NewBieWin.prefab
index c2f4439..122e527 100644
--- a/UI/NewBieWin.prefab
+++ b/UI/NewBieWin.prefab
@@ -75,7 +75,7 @@
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.9245283, g: 0.84915215, b: 0.7122938, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -371,7 +371,7 @@
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -566,7 +566,7 @@
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -1290,7 +1290,7 @@
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -1757,7 +1757,7 @@
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
@@ -2022,7 +2022,7 @@
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_RaycastTarget: 1
+ m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
--
Gitblit v1.8.0