Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout

gwj

2025-09-15 fae140d8f196316bd9c5440880a0391feda26f5b

Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_resourcesout

 BuiltIn/Prefabs/LaunchExWin.prefab

Diff too large

 BuiltIn/Prefabs/LaunchWin.prefab

 BuiltIn/Prefabs/LaunchWin.prefab.meta

 Config/FuncConfig.txt

@@ -16,7 +16,7 @@
TreasureSet    {0:10,1:10}    {2330:[4318,4313,4323,4328,4358,4393,4383,4433,4348,4438,4388,4443,4363,4428,4343,4353],2331:[4319,4314,4324,4329,4359,4394,4384,4434,4349,4439,4389,4444,4364,4429,4344,4354],2332:[4320,4315,4325,4330,4360,4395,4385,4435,4350,4440,4390,4445,4365,4430,4345,4355],2214:[4183,4185,195,199]}    200        

HeroStarTalent    4    10    3    5    

HeroWash    10    [20,40,60,100,150,230]    5        

HeroRebirth    1    2    heroLV    80    80

HeroRebirth    1    2    heroLV    100    80

HeroAttrFormula    (lvValue+equipValue+bookValue)*(1+lineupHaloPer+bookPer+lineupInitAddPer+lineupLVAddPer+lineupBreakLVAddPer+lineupStarAddPer)*(inheritPer+fetterPer+starTalentPer+breakLVPer+awakeTalentPer)+heroSelfValue    (lvValue+equipValue+bookValue)+(heroSelfValue+lineupHaloValue+starTalentValue+breakLVValue+awakeTalentValue)+fetterValue    int(Atk*AtkRatio+MaxHP*MaxHPRatio+Def*DefRatio+(StunRate*StunRateRatio+SuperHitRate*SuperHitRateRatio+ComboRate*ComboRateRatio+MissRate*MissRateRatio+ParryRate*ParryRateRatio+SuckHPPer*SuckHPPerRatio+StunRateDef*StunRateDefRatio+SuperHitRateDef*SuperHitRateDefRatio+ComboRateDef*ComboRateDefRatio+MissRateDef*MissRateDefRatio+ParryRateDef*ParryRateDefRatio+SuckHPPerDef*SuckHPPerDefRatio+FinalDamPer*FinalDamPerRatio+FinalDamPerDef*FinalDamPerDefRatio+PhyDamPer*PhyDamPerRatio+PhyDamPerDef*PhyDamPerDefRatio+MagDamPer*MagDamPerRatio+MagDamPerDef*MagDamPerDefRatio+NormalSkillPer*NormalSkillPerRatio+NormalSkillPerDef*NormalSkillPerDefRatio+AngerSkillPer*AngerSkillPerRatio+AngerSkillPerDef*AngerSkillPerDefRatio+SuperDamPer*SuperDamPerRatio+SuperDamPerDef*SuperDamPerDefRatio+CurePer*CurePerRatio+CurePerDef*CurePerDefRatio+ShieldPer*ShieldPerRatio+ShieldPerDef*ShieldPerDefRatio+DOTPer*DOTPerRatio+DOTPerDef*DOTPerDefRatio+WeiFinalDamPer*WeiFinalDamPerRatio+WeiFinalDamPerDef*WeiFinalDamPerDefRatio+ShuFinalDamPer*ShuFinalDamPerRatio+ShuFinalDamPerDef*ShuFinalDamPerDefRatio+WuFinalDamPer*WuFinalDamPerRatio+WuFinalDamPerDef*WuFinalDamPerDefRatio+QunFinalDamPer*QunFinalDamPerRatio+QunFinalDamPerDef*QunFinalDamPerDefRatio)/100.0)    SkillPower*OfficialLV    

FuncLevelLimitClient    {"1":30}                

DownReward    [(1,200,1),(2,5000,1),(3,500,1)]     20    [[1,100,0],[3,200,0]]    1    1


 Config/InitialFunction.txt

@@ -3,5 +3,5 @@
标识    数值1    数值2    数值3    数值4    数值5

CheckTime    0    0            

NetworkCheck    20    3            

Language            正在构建修仙世界    当前网络环境不稳定，请检查网络环境	
Language            正在构建像素世界    当前网络环境不稳定，请检查网络环境	
version    103                


 Shader/OutlineEx.shader

@@ -134,7 +134,7 @@
                const fixed sinArray[12] = { 0, 0.5, 0.866, 1, 0.866, 0.5, 0, -0.5, -0.866, -1, -0.866, -0.5 };

                const fixed cosArray[12] = { 1, 0.866, 0.5, 0, -0.5, -0.866, -1, -0.866, -0.5, 0, 0.5, 0.866 };



                float2 pos = IN.texcoord + _MainTex_TexelSize.xy * float2(cosArray[pIndex], sinArray[pIndex]) * IN.normal.z*0.2;    //normal.z 存放 _OutlineWidth

                float2 pos = IN.texcoord + _MainTex_TexelSize.xy * float2(cosArray[pIndex], sinArray[pIndex]) * IN.normal.z*0.12;    //normal.z 存放 _OutlineWidth

                return IsInRect(pos, IN.uv1, IN.uv2) * (tex2D(_MainTex, pos) + _TextureSampleAdd).w * IN.tangent.w;        //tangent.w  存放 _OutlineColor.w

            }