1

2024-11-23 17:17:10 +08:00 · 2024-11-23 17:17:10 +08:00 · 1ffc9711dc
parent 6cc53eb9dc
commit 1ffc9711dc
7 changed files with 172 additions and 41 deletions
--- a/Assets/Artists/Models/Kumabucks/color_yangdun.mat
+++ b/Assets/Artists/Models/Kumabucks/color_yangdun.mat
@ -276,6 +276,7 @@ Material:
    - _Blend: 0
    - _BlendMode: 0
    - _BlendModePreserveSpecular: 1
+    - _BlendOp: 0
    - _BlurLevelMatcap: 0
    - _BlurLevelSGM: 0
    - _BumpScale: 1
@ -428,6 +429,7 @@ Material:
    - _SPRDefaultUnlitColorMask: 15
    - _SRPDefaultUnlitColMode: 1
    - _SSRefractionProjectionModel: 0
+    - _SampleGI: 0
    - _Scroll_EmissiveU: 0
    - _Scroll_EmissiveV: 0
    - _SecondShadeOverridden: 0
@ -505,8 +507,8 @@ Material:
    - _Unlit_Intensity: 0
    - _UseEmissiveIntensity: 0
    - _UseShadowThreshold: 0
-    - _Use_1stAs2nd: 0
-    - _Use_BaseAs1st: 0
+    - _Use_1stAs2nd: 1
+    - _Use_BaseAs1st: 1
    - _WorkflowMode: 1
    - _ZOverDrawMode: 0
    - _ZTestDepthEqualForOpaque: 4
--- a/Assets/Artists/UX/ux_dialogue_choose_template.uxml
+++ b/Assets/Artists/UX/ux_dialogue_choose_template.uxml
@ -1,5 +1,5 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
-    <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="Button-0" style="flex-direction: row; align-items: center;">
+    <ui:Button parse-escape-sequences="true" display-tooltip-when-elided="true" name="Button--0" style="flex-direction: row; align-items: center;">
        <ui:Label tabindex="-1" text="[1]" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Label--0" style="width: 32px;" />
        <ui:Label tabindex="-1" text="选择A" parse-escape-sequences="true" display-tooltip-when-elided="true" name="Label--1" />
    </ui:Button>
--- a/Assets/Artists/UX/ux_hud.uxml
+++ b/Assets/Artists/UX/ux_hud.uxml
@ -1,7 +1,7 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xsi="http://www.w3.org/2001/XMLSchema-instance" engine="UnityEngine.UIElements" editor="UnityEditor.UIElements" noNamespaceSchemaLocation="../../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
    <ui:Template name="ux_quest_template" src="project://database/Assets/Artists/UX/ux_quest_template.uxml?fileID=9197481963319205126&amp;guid=3e4b142e8b224ce42a5258702fcb6270&amp;type=3#ux_quest_template" />
-    <ui:Template name="ux_dialogue_template" src="project://database/Assets/Artists/UX/ux_dialogue_template.uxml?fileID=9197481963319205126&amp;guid=af60a5419d14491468066d33d8806fc1&amp;type=3#ux_dialogue_template" />
    <ui:Template name="ux_dialogue_choose_template" src="project://database/Assets/Artists/UX/ux_dialogue_choose_template.uxml?fileID=9197481963319205126&amp;guid=0651c86a74198604da9d71321f73cbd5&amp;type=3#ux_dialogue_choose_template" />
+    <ui:Template name="ux_dialogue_template" src="project://database/Assets/Artists/UX/ux_dialogue_template.uxml?fileID=9197481963319205126&amp;guid=af60a5419d14491468066d33d8806fc1&amp;type=3#ux_dialogue_template" />
    <Style src="project://database/Assets/BITKit/Unity/UX/Common/Common.uss?fileID=7433441132597879392&amp;guid=a3a69d3518fd02b489e721f3c5b0b539&amp;type=3#Common" />
    <Style src="project://database/Assets/Artists/UX/Style.uss?fileID=7433441132597879392&amp;guid=506d41b7c5d56a44bb5845e69055a5eb&amp;type=3#Style" />
    <ui:VisualElement class="container-my-8" style="position: absolute; left: 32px; top: 32px; overflow: hidden;">
@ -13,17 +13,11 @@
    <ui:VisualElement name="quest-container" style="position: absolute; top: 32px; right: 32px; background-color: rgba(0, 0, 0, 0.78);">
        <ui:Instance template="ux_quest_template" name="ux_quest_template" />
    </ui:VisualElement>
-    <ui:Label tabindex="-1" text="互动" parse-escape-sequences="true" display-tooltip-when-elided="true" name="interaction-tips" class="flex-center tl" style="top: 32px; background-color: rgba(0, 0, 0, 0.78); padding-top: 4px; padding-right: 8px; padding-bottom: 4px; padding-left: 8px;" />
-    <ui:VisualElement picking-mode="Ignore" class="root">
-        <ui:VisualElement name="dialogue-choose-container">
-            <ui:Instance template="ux_dialogue_choose_template" name="ux_dialogue_choose_template" />
-        </ui:VisualElement>
-        <ui:VisualElement style="margin-top: auto; margin-right: auto; margin-bottom: 16px; margin-left: auto; flex-direction: row; align-items: center; background-color: rgba(0, 0, 0, 0.78); width: 256px;">
-            <ui:VisualElement style="width: 64px; height: 64px; background-image: url(&quot;project://database/Assets/Artists/Arts/Avatars/avatar_player.jpg?fileID=2800000&amp;guid=dc1a7b7a5cc9437438280932e8b541a0&amp;type=3#avatar_player&quot;);" />
-            <ui:VisualElement style="flex-grow: 1; margin-top: 5px; margin-right: 5px; margin-bottom: 5px; margin-left: 5px;">
-                <ui:Label tabindex="-1" text="羊顿爵士" parse-escape-sequences="true" display-tooltip-when-elided="true" class="tl" style="flex-grow: 1;" />
-            </ui:VisualElement>
-        </ui:VisualElement>
+    <ui:Label tabindex="-1" text="互动" parse-escape-sequences="true" display-tooltip-when-elided="true" name="interaction-tips" class="flex-center tl" style="background-color: rgba(0, 0, 0, 0.78); padding-top: 4px; padding-right: 8px; padding-bottom: 4px; padding-left: 8px; position: absolute; left: 50%; top: 50%;" />
+    <ui:VisualElement name="dialogue-choose-container" style="position: absolute; right: 590px; top: 423px;">
+        <ui:Instance template="ux_dialogue_choose_template" name="ux_dialogue_choose_template" />
+        <ui:Instance template="ux_dialogue_choose_template" name="ux_dialogue_choose_template" />
+        <ui:Instance template="ux_dialogue_choose_template" name="ux_dialogue_choose_template" />
    </ui:VisualElement>
    <ui:ScrollView picking-mode="Ignore" name="dialogue-container" class="flex-center dialogue-container" style="background-color: rgba(0, 0, 0, 0.78); border-top-left-radius: 8px; border-top-right-radius: 8px; border-bottom-right-radius: 8px; border-bottom-left-radius: 8px; min-width: 512px; bottom: -25%; max-height: 300px; padding-top: 8px; padding-right: 8px; padding-bottom: 8px; padding-left: 8px;">
        <ui:Instance template="ux_dialogue_template" name="ux_dialogue_template" />
--- a/Scenes/map_city_crossing.unity
+++ b/Scenes/map_city_crossing.unity
@ -15,7 +15,7 @@ RenderSettings:
  m_ObjectHideFlags: 0
  serializedVersion: 9
  m_Fog: 1
-  m_FogColor: {r: 0.88186914, g: 0.9243294, b: 0.879878, a: 1}
+  m_FogColor: {r: 0.8681467, g: 0.94227856, b: 0.9337227, a: 1}
  m_FogMode: 2
  m_FogDensity: 0.005
  m_LinearFogStart: 19.92
@ -22131,7 +22131,7 @@ Light:
  m_Type: 1
  m_Shape: 0
  m_Color: {r: 1, g: 0.99511117, b: 0.8632076, a: 1}
-  m_Intensity: 0.81390303
+  m_Intensity: 0.9824571
  m_Range: 10
  m_SpotAngle: 30
  m_InnerSpotAngle: 21.80208
@ -22189,7 +22189,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 381609845}
  serializedVersion: 2
-  m_LocalRotation: {x: 0.17689298, y: -0.46963087, z: 0.09664949, w: 0.85954326}
+  m_LocalRotation: {x: 0.14935695, y: -0.74263936, z: 0.17647581, w: 0.62851864}
  m_LocalPosition: {x: 0, y: 3, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -43376,6 +43376,76 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: 5906691224995531166, guid: c0992ede281f15741afa3c5ce7a8409d, type: 3}
  m_PrefabInstance: {fileID: 667700014}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &669466981
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 1907932602}
+    m_Modifications:
+    - target: {fileID: 1538259220956459689, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: m_RootOrder
+      value: 701
+      objectReference: {fileID: 0}
+    - target: {fileID: 1538259220956459689, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 43.29
+      objectReference: {fileID: 0}
+    - target: {fileID: 1538259220956459689, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.15
+      objectReference: {fileID: 0}
+    - target: {fileID: 1538259220956459689, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 18.38
+      objectReference: {fileID: 0}
+    - target: {fileID: 1538259220956459689, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7786204
+      objectReference: {fileID: 0}
+    - target: {fileID: 1538259220956459689, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.000000018218712
+      objectReference: {fileID: 0}
+    - target: {fileID: 1538259220956459689, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.6274952
+      objectReference: {fileID: 0}
+    - target: {fileID: 1538259220956459689, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0.0000000120726975
+      objectReference: {fileID: 0}
+    - target: {fileID: 1538259220956459689, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1538259220956459689, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 77.731
+      objectReference: {fileID: 0}
+    - target: {fileID: 1538259220956459689, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2167126629911128083, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: m_Name
+      value: SM_vendingmachine_tokyo (27)
+      objectReference: {fileID: 0}
+    - target: {fileID: 9156600402475172498, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+      propertyPath: managedReferences[7537829096084996098].value
+      value: "\u81EA\u52A8\u626D\u86CB\u673A"
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+--- !u!4 &669466982 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 1538259220956459689, guid: 04a122351bf6b37449b00a4b87c72a23, type: 3}
+  m_PrefabInstance: {fileID: 669466981}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &670276471
 PrefabInstance:
  m_ObjectHideFlags: 0
@ -45360,7 +45430,7 @@ Light:
  m_Type: 1
  m_Shape: 0
  m_Color: {r: 0.8431373, g: 0.9843138, b: 1, a: 1}
-  m_Intensity: 0.00008701095
+  m_Intensity: 0.00019715827
  m_Range: 10
  m_SpotAngle: 30
  m_InnerSpotAngle: 21.80208
@ -45418,7 +45488,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 696258054}
  serializedVersion: 2
-  m_LocalRotation: {x: -0.14362426, y: 0.8529524, z: 0.3937764, w: 0.3111021}
+  m_LocalRotation: {x: -0.40330237, y: 0.5133484, z: 0.2971187, w: 0.6968078}
  m_LocalPosition: {x: 0, y: 3, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
@ -203392,6 +203462,7 @@ Transform:
  - {fileID: 1332234413}
  - {fileID: 1969462979}
  - {fileID: 1596234169}
+  - {fileID: 669466982}
  - {fileID: 988795627}
  - {fileID: 1954899992}
  - {fileID: 117686530}
--- a/Billboards/SM_wallpaper_02
+++ b/Billboards/SM_wallpaper_02
@ -11,7 +11,9 @@ GameObject:
  - component: {fileID: 1757346785902184081}
  - component: {fileID: 3444270760381696308}
  - component: {fileID: 587848720192650750}
-  - component: {fileID: 2297706287129896081}
+  - component: {fileID: 1834495384133769876}
+  - component: {fileID: 2204397137372045492}
+  - component: {fileID: 291689189633534057}
  m_Layer: 0
  m_Name: SM_wallpaper_02 (2)
  m_TagString: Untagged
@ -26,13 +28,13 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1380504175815662635}
+  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 0}
-  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &3444270760381696308
 MeshFilter:
@ -84,17 +86,79 @@ MeshRenderer:
  m_SortingLayer: 0
  m_SortingOrder: 0
  m_AdditionalVertexStreams: {fileID: 0}
--- !u!64 &2297706287129896081
-MeshCollider:
+--- !u!65 &1834495384133769876
+BoxCollider:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1380504175815662635}
  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
  m_IsTrigger: 0
+  m_ProvidesContacts: 0
  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 8820485203947914738, guid: 7b374f511101abe4d8822edfb063c72e, type: 3}
+  serializedVersion: 3
+  m_Size: {x: 0.77075803, y: 1.1561371, z: 0.0000002392335}
+  m_Center: {x: 0, y: 0, z: 0.0019352201}
+--- !u!114 &2204397137372045492
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1380504175815662635}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: db48a34ef668447439789f37091202ae, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  root: {fileID: 0}
+  type:
+    rid: -2
+  references:
+    version: 2
+    RefIds:
+    - rid: -2
+      type: {class: , ns: , asm: }
+--- !u!114 &291689189633534057
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1380504175815662635}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 054d7fc7589c04d4a8412a6f82b32d6c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  worldNodeService:
+    rid: 550035556037033984
+  worldNode:
+    rid: 550035556037033985
+  references:
+    version: 2
+    RefIds:
+    - rid: -2
+      type: {class: , ns: , asm: }
+    - rid: 550035556037033984
+      type: {class: WorldNodeService, ns: BITKit.WorldNode, asm: BITKit.WorldNode}
+      data: 
+    - rid: 550035556037033985
+      type: {class: WorldInfoNode, ns: BITKit.WorldNode, asm: BITKit.WorldNode}
+      data:
+        name:
+          rid: 550035556037033986
+        description:
+          rid: -2
+    - rid: 550035556037033986
+      type: {class: Reference, ns: BITKit, asm: BITKit}
+      data:
+        value: "\u81EA\u52A9\u9910\u70E7\u9E1F/\u713C\u304D\u9CE5"
--- a/Sky/Sample/Scenes/DayNightCycle/SkyProfile-741169173868421736.asset
+++ b/Sky/Sample/Scenes/DayNightCycle/SkyProfile-741169173868421736.asset
@ -204,11 +204,11 @@ Material:
    - _HorizonCloudStart: -0.01
    - _HorizonCloudStartPosition: -0.01
    - _HorizonCloudStep: 25
-    - _HorizonExponent: 4.619862
+    - _HorizonExponent: 3.8273911
    - _HorizonStep: 1000
    - _HorizonThickness: 1
    - _MoonGlow: 0.236
-    - _MoonLightIntensity: 0.00008701095
+    - _MoonLightIntensity: 0.00001139632
    - _MoonSize: 0.07
    - _MoonSoftEdge: 0.22
    - _OverheadCloudAltitude: 1000
@ -217,8 +217,8 @@ Material:
    - _OverheadCloudFlowDirectionZ: 1
    - _OverheadCloudFlowX: 1
    - _OverheadCloudFlowZ: 1
-    - _OverheadCloudRemapMax: 3.2330332
-    - _OverheadCloudRemapMin: 0.41945106
+    - _OverheadCloudRemapMax: 1.8452492
+    - _OverheadCloudRemapMin: 0.23646876
    - _OverheadCloudSize: 10
    - _OverheadCloudStep: 2
    - _StarsDensity0: 0.4
@ -239,26 +239,26 @@ Material:
    - _StarsTwinkle1: 6
    - _StarsTwinkle2: 2
    - _SunGlow: 0.45
-    - _SunLightIntensity: 0.81390303
+    - _SunLightIntensity: 0.43717447
    - _SunSize: 0.07
    - _SunSoftEdge: 0.5
    m_Colors:
    - _DetailOverlayColor: {r: 1, g: 1, b: 1, a: 1}
    - _DetailOverlayTintColor: {r: 1, g: 1, b: 1, a: 1}
    - _FogColor: {r: 0.8490566, g: 0.69017035, b: 0.6287825, a: 1}
-    - _GroundColor: {r: 0.464328, g: 0.45621884, b: 0.4719259, a: 1}
+    - _GroundColor: {r: 0.42987296, g: 0.41393125, b: 0.44480956, a: 1}
    - _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
-    - _HorizonColor: {r: 0.88186914, g: 0.92432946, b: 0.879878, a: 1}
+    - _HorizonColor: {r: 0.89692837, g: 0.87857676, b: 0.79214877, a: 1}
    - _MoonColor: {r: 1, g: 1, b: 1, a: 0}
-    - _MoonDirection: {r: 0.4175989, g: 0.7611087, b: -0.49631158, a: 0}
+    - _MoonDirection: {r: 0.25133455, g: 0.4580781, b: -0.85264057, a: 0}
    - _MoonLightColor: {r: 0.8431373, g: 0.9843138, b: 1, a: 1}
-    - _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.9927014}
-    - _SkyColor: {r: 0.30063137, g: 0.60054743, b: 0.8717994, a: 1}
+    - _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.99229914}
+    - _SkyColor: {r: 0.24189956, g: 0.44873634, b: 0.69703615, a: 1}
    - _StarsColor0: {r: 0.96470594, g: 0.9450981, b: 0.76470596, a: 1}
    - _StarsColor1: {r: 1, g: 0.5294118, b: 0.93725497, a: 1}
    - _StarsColor2: {r: 0, g: 0.92549026, b: 1, a: 1}
-    - _SunColor: {r: 0.9716981, g: 0.92374295, b: 0.84386903, a: 1}
-    - _SunDirection: {r: -0.7731429, g: -0.3948735, b: 0.49631146, a: 0}
+    - _SunColor: {r: 0.9716981, g: 0.92477906, b: 0.8472319, a: 1}
+    - _SunDirection: {r: -0.46532097, g: -0.23765716, b: 0.8526403, a: 0}
    - _SunLightColor: {r: 1, g: 0.99511117, b: 0.8632076, a: 1}
  m_BuildTextureStacks: []
 --- !u!21 &8993251732621375409
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@ -19,7 +19,7 @@ QualitySettings:
    shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
    shadowmaskMode: 0
    skinWeights: 1
-    globalTextureMipmapLimit: 3
+    globalTextureMipmapLimit: 0
    textureMipmapLimitSettings: []
    anisotropicTextures: 0
    antiAliasing: 0