From aed3478031945dab2fcedbf356b5ecc5aa030e16 Mon Sep 17 00:00:00 2001
From: hwj35 <691170510@qq.com>
Date: 星期四, 30 十月 2025 14:29:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout
---
UI/StoreWin.prefab | 24 ++++++++++++------------
Config/FuncConfig.txt | 1 +
Config/FuncOpenLV.txt | 6 +++++-
Config/SysInfo.txt | 1 +
UIComp/OneLevelWin.prefab | 6 +++---
5 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/Config/FuncConfig.txt b/Config/FuncConfig.txt
index 2d430a1..e3b53ab 100644
--- a/Config/FuncConfig.txt
+++ b/Config/FuncConfig.txt
@@ -64,3 +64,4 @@
StoreHeroSoul 12 43|5000 1
MainRightFunc 16
Item {"150":"HeroHead"}
+BattleButton 3
diff --git a/Config/FuncOpenLV.txt b/Config/FuncOpenLV.txt
index d7b308a..cd1aed0 100644
--- a/Config/FuncOpenLV.txt
+++ b/Config/FuncOpenLV.txt
@@ -32,4 +32,8 @@
29 0 0 0 鎴愬氨
30 1 0 0 骞诲闃�
31 0 0 0 婕旀鍦哄竷闃�
-32 0 0 0 鍒囧嚭鎴樻枟
+32 0 0 0 鎴樻枟绯荤粺-鍏佽鍚庡彴鎴樻枟
+33 0 0 0 鎴樻枟绯荤粺-璺宠繃
+34 0 0 0 鎴樻枟绯荤粺-鍔犻�焁1
+35 0 0 1003 鎴樻枟绯荤粺-鍔犻�焁2
+36 0 0 1003 鎴樻枟绯荤粺-鍔犻�焁3
diff --git a/Config/SysInfo.txt b/Config/SysInfo.txt
index 036db67..a927e7e 100644
--- a/Config/SysInfo.txt
+++ b/Config/SysInfo.txt
@@ -110,3 +110,4 @@
GeRen_lhs_202580 0 0 2 鎮ㄧ殑鑳屽寘绌洪棿涓嶈冻锛岃鍏堟竻鐞嗚儗鍖� 0
ZhenbaogeCut 0 0 2 鐮嶄环<color=#109D06>%s0</color>
NoGuild 0 0 2 璇峰厛鍔犲叆鍏細
+BattlePass 0 0 2 %s0鍥炲悎鍚庡彲璺宠繃
diff --git a/UI/StoreWin.prefab b/UI/StoreWin.prefab
index 2edd5fe..ee5f715 100644
--- a/UI/StoreWin.prefab
+++ b/UI/StoreWin.prefab
@@ -1243,12 +1243,12 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5452054863534864710}
- m_Father: {fileID: 4935484192978641203}
+ m_Father: {fileID: 2942073222668467515}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 1}
- m_AnchoredPosition: {x: -1.5, y: -399.77002}
- m_SizeDelta: {x: 721, y: 551.54}
+ m_AnchoredPosition: {x: 3.5, y: -221.27002}
+ m_SizeDelta: {x: 721, y: -641.46}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &996187529301890372
MonoBehaviour:
@@ -1688,6 +1688,8 @@
- {fileID: 4207338182367194012}
- {fileID: 5579382918782066958}
- {fileID: 4935484192978641203}
+ - {fileID: 5133277293253246448}
+ - {fileID: 3140967112057574093}
m_Father: {fileID: 7112353317578617827}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -2174,11 +2176,11 @@
- {fileID: 4985072274707602804}
- {fileID: 5147634487109341213}
- {fileID: 2283672632283616098}
- m_Father: {fileID: 4935484192978641203}
+ m_Father: {fileID: 2942073222668467515}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -4.5, y: -28.5}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 0.5, y: -517}
m_SizeDelta: {x: 631, y: 98}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1611607110843080988
@@ -2596,9 +2598,9 @@
- {fileID: 6222947719154589006}
m_Father: {fileID: 4935484192978641203}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 280.5, y: 42.5}
+ m_AnchorMin: {x: 0.5, y: 1}
+ m_AnchorMax: {x: 0.5, y: 1}
+ m_AnchoredPosition: {x: 280.5, y: -28}
m_SizeDelta: {x: 135, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8439241544900387860
@@ -7356,8 +7358,6 @@
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6326499976871535578}
- - {fileID: 5133277293253246448}
- - {fileID: 3140967112057574093}
m_Father: {fileID: 2942073222668467515}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
diff --git a/UIComp/OneLevelWin.prefab b/UIComp/OneLevelWin.prefab
index 6665986..664f500 100644
--- a/UIComp/OneLevelWin.prefab
+++ b/UIComp/OneLevelWin.prefab
@@ -34,9 +34,9 @@
- {fileID: 4149599520305502842}
m_Father: {fileID: 7112353317578617827}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: -0.5, y: -652.5}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: 0, y: 14.5}
m_SizeDelta: {x: 759, y: 170}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6952880336433893296
--
Gitblit v1.8.0