duongtx/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'Update setting shadow and prefabs character' (#446) from feature/dlg_setting into develop

Browse Source 
Reviewed-on: https://git.pthub.vn/Unity/perfect-world-unity/pulls/446
This commit is contained in:
tungdv
2026-05-18 09:28:05 +00:00
parent 96222636d6 fa36d03a32
commit b6ee6809f2
12 changed files with 56 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/ModelRenderer/Art/Models/models/players/形象/妖兽男/躯干/妖兽男.prefab
+4 -4
View File
@@ -1086,12 +1086,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1586460751305980025}
serializedVersion: 2
m_LocalRotation: {x: -0.0028185218, y: 0.001483613, z: -0.0021672554, w: 0.9999926}
m_LocalPosition: {x: -0.05562985, y: -0.081015944, z: 0.39748663}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.083, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6120553475674564225}
m_Father: {fileID: 9093093661518282336}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1599535802249663509
GameObject:
@@ -1347,6 +1347,7 @@ Transform:
m_Children:
- {fileID: 5617803600690971247}
- {fileID: 6120553475674564225}
- {fileID: 8065888237917903913}
- {fileID: 2557490350009383498}
- {fileID: 2568262481098835120}
- {fileID: 7627100027010130243}
@@ -6757,7 +6758,6 @@ Transform:
m_Children:
- {fileID: 3977730433532276168}
- {fileID: 2662211301128182155}
- {fileID: 8065888237917903913}
m_Father: {fileID: 9093093661518282336}
m_LocalEulerAnglesHint: {x: -0, y: -90.00006, z: -20.5}
--- !u!1 &5938155744799244006
Assets/ModelRenderer/Art/Models/models/players/形象/妖精/躯干/妖精.prefab
+4 -4
View File
@@ -908,12 +908,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3301800035822988596}
serializedVersion: 2
m_LocalRotation: {x: -0.0028185218, y: 0.001483613, z: -0.0021672554, w: 0.9999926}
m_LocalPosition: {x: -0.055629853, y: -0.043065064, z: 0.7056381}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.043064117, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3761173583069913937}
m_Father: {fileID: 1217523753656424939}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3410007307219032032
GameObject:
@@ -1170,7 +1170,6 @@ Transform:
- {fileID: 9072456093803511430}
- {fileID: 895268444697552557}
- {fileID: 6136555785825000959}
- {fileID: 1173494169281489193}
m_Father: {fileID: 1217523753656424939}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4365813478962251138
@@ -1433,6 +1432,7 @@ Transform:
m_Children:
- {fileID: 3198362695182116239}
- {fileID: 3761173583069913937}
- {fileID: 1173494169281489193}
- {fileID: 6420883966070314246}
- {fileID: 6433847210851598448}
- {fileID: 353590027158756827}
Assets/ModelRenderer/Art/Models/models/players/形象/武侠男/躯干/武侠男.prefab
+2 -2
View File
@@ -550,13 +550,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 718027248117386100}
serializedVersion: 2
m_LocalRotation: {x: -0.0028219558, y: 0.0014860885, z: -0.0021686708, w: 0.99999255}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.00100543, y: -0.09320626, z: -0.39749146}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1172840009114654878}
m_LocalEulerAnglesHint: {x: -0.323, y: 0.171, z: -0.249}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &718163507281540042
GameObject:
m_ObjectHideFlags: 0
Assets/ModelRenderer/Art/Models/models/players/形象/法师女/躯干/法师女.prefab
+5 -5
View File
@@ -2244,12 +2244,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 539859718645028576}
serializedVersion: 2
m_LocalRotation: {x: 0.001045378, y: 0.0009246335, z: -0.0018021397, w: 0.99999744}
m_LocalPosition: {x: -0.057869744, y: -0.10180388, z: 0.48548856}
m_LocalScale: {x: 1, y: 0.99999994, z: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.057869744, y: -0.10180388, z: -0.48548856}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3163783776936795972}
m_Father: {fileID: 7927131576927491774}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &572416469498270190
GameObject:
@@ -2501,7 +2501,6 @@ Transform:
- {fileID: 164087172388062944}
- {fileID: 4538769385099245324}
- {fileID: 9118939558005918140}
- {fileID: 6894184546782334129}
- {fileID: 8024274896586816927}
- {fileID: 4598802323848573177}
- {fileID: 3028983531780590137}
@@ -4902,6 +4901,7 @@ Transform:
m_Children:
- {fileID: 5591336977158495732}
- {fileID: 3163783776936795972}
- {fileID: 6894184546782334129}
- {fileID: 3490015070446909643}
- {fileID: 7004614097688005061}
- {fileID: 5302950843270058915}
Assets/ModelRenderer/Art/Models/models/players/形象/火狐狸/火狐狸.prefab
+1 -1
View File
@@ -2443,7 +2443,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3932382321297672286}
serializedVersion: 2
m_LocalRotation: {x: -0.002818518, y: 0.0014836128, z: -0.0021672554, w: 0.9999926}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.05562985, y: -0.081015944, z: 0.39748663}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
Assets/ModelRenderer/Art/Models/models/players/形象/白虎/白虎.prefab
+4 -4
View File
@@ -2552,12 +2552,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 878803474275340366}
serializedVersion: 2
m_LocalRotation: {x: -0.0028185144, y: 0.0014836128, z: -0.0021672559, w: 0.9999926}
m_LocalPosition: {x: -0.05562985, y: -0.081015944, z: 0.39748663}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.081015944, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 6617056429551574344}
m_Father: {fileID: 6217677049184425441}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1026482648786105287
GameObject:
@@ -2621,7 +2621,6 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5253703419736144804}
- {fileID: 6281181142977494437}
m_Father: {fileID: 6217677049184425441}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1200614877094076029
@@ -5825,6 +5824,7 @@ Transform:
m_Children:
- {fileID: 1706783410091619014}
- {fileID: 6617056429551574344}
- {fileID: 6281181142977494437}
- {fileID: 3957800845321419564}
- {fileID: 3507423340308239705}
- {fileID: 2535842871432185217}
Assets/ModelRenderer/Art/Models/models/players/形象/羽灵女/躯干/羽灵女.prefab
+5 -5
View File
@@ -930,6 +930,7 @@ Transform:
m_Children:
- {fileID: 8029207938074169240}
- {fileID: 2939699527378224194}
- {fileID: 3993622282087158431}
- {fileID: 5166227302566834579}
- {fileID: 8780848996795449532}
- {fileID: 2812443159892340770}
@@ -2394,12 +2395,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2130509308051034256}
serializedVersion: 2
m_LocalRotation: {x: 0.001045378, y: 0.0009246335, z: -0.0018021397, w: 0.99999744}
m_LocalPosition: {x: -0.057869744, y: -0.10180388, z: 0.48548856}
m_LocalScale: {x: 1, y: 0.99999994, z: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.10180388, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2939699527378224194}
m_Father: {fileID: 2429949190850124587}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2243452211286738028
GameObject:
@@ -6749,7 +6750,6 @@ Transform:
- {fileID: 8723648061500461819}
- {fileID: 5372090311351204172}
- {fileID: 6543030539956956176}
- {fileID: 3993622282087158431}
- {fileID: 7830278117140851798}
- {fileID: 8124835409598199763}
- {fileID: 2532083169722813602}
Assets/ModelRenderer/Art/Models/models/players/形象/羽芒男/躯干/羽芒男.prefab
+4 -4
View File
@@ -257,7 +257,6 @@ Transform:
m_Children:
- {fileID: 1483003636365782390}
- {fileID: 231483440898196387}
- {fileID: 3922132859931617339}
m_Father: {fileID: 4753121029511765255}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2509574234440600368
@@ -778,6 +777,7 @@ Transform:
m_Children:
- {fileID: 1555769994225745494}
- {fileID: 8112031461099008836}
- {fileID: 3922132859931617339}
- {fileID: 6317940480286668807}
- {fileID: 8660872401492081506}
- {fileID: 4164076159186582196}
@@ -2009,12 +2009,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5470120182797038309}
serializedVersion: 2
m_LocalRotation: {x: -0.0028185218, y: 0.001483613, z: -0.0021672554, w: 0.9999926}
m_LocalPosition: {x: 0.0010054297, y: -0.09320626, z: 0.39748663}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.093206406, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 8112031461099008836}
m_Father: {fileID: 4753121029511765255}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5534663482504530164
GameObject:
Assets/PerfectWorld/Prefab/UI/DlgSetting.prefab
+5 -5
View File
@@ -7205,7 +7205,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5725138947417197620
RectTransform:
m_ObjectHideFlags: 0
@@ -7222,10 +7222,10 @@ RectTransform:
- {fileID: 8978764815918038982}
m_Father: {fileID: 8859678125751154879}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 86.35, y: -47.22}
m_SizeDelta: {x: 172.7, y: 66.44}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &7259619490849805827
MonoBehaviour:
Assets/PerfectWorld/Scripts/MainFiles/EC_Game.cs
+10 -6
View File
@@ -700,13 +700,17 @@ namespace BrewMonster.Network
public static void SetSettingActiveShadow(bool value)
{
PlayerPrefs.SetInt(keySettingActiveShadow, value ? 1 : 0);
if (value)
UniversalRenderPipelineAsset urpAsset = GraphicsSettings.currentRenderPipeline as UniversalRenderPipelineAsset;
if(urpAsset != null)
{
}
else
{
if (value)
{
urpAsset.shadowDistance = 50f;
}
else
{
urpAsset.shadowDistance = 0f;
}
}
}
Assets/Scripts/CECPlayer_Inventory.cs
+11 -2
View File
@@ -417,11 +417,20 @@ namespace BrewMonster
if(pflySwordPrefab != null)
{
var pflySwordObject = Instantiate(pflySwordPrefab).transform;
pflySwordObject.parent = m_pPlayerCECModel.m_skeletonBuilder.GetHook("HH_feijian").transform;
Transform HH_feijian = m_pPlayerCECModel.m_skeletonBuilder.GetHook("HH_feijian").transform;
Transform CC_feijian = FindChildRecursive(pflySwordObject, "CC_feijian");
var posHH_feijian = HH_feijian.localPosition;
if (posHH_feijian.z < 0)
{
posHH_feijian.z *= -1f;
}
posHH_feijian.y += CC_feijian.localPosition.y;
HH_feijian.localPosition = posHH_feijian;
pflySwordObject.parent = HH_feijian;
pflySwordObject.localPosition = Vector3.zero;
pflySwordObject.localRotation = Quaternion.identity;
pflySwordObject.localScale = Vector3.one;
//HH_feijian.transform.position = CC_feijian.transform.position;
m_Wing = pflySwordObject.transform;
m_Wing.gameObject.SetActive(false);
ProjectSettings/GraphicsSettings.asset
+1 -1
View File
@@ -45,7 +45,7 @@ GraphicsSettings:
m_DefaultMobileRenderingPath: 1
m_TierSettings: []
m_LightmapStripping: 0
m_FogStripping: 0
m_FogStripping: 1
m_InstancingStripping: 0
m_BrgStripping: 0
m_LightmapKeepPlain: 1