浏览代码

Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt   resolved by master version
lzx 3 天之前
父节点
当前提交
31e9ef1c53

+ 148 - 0
Assets/Art/VFX/Materials/UIMat/ui_fzgf_wl1.mat

@@ -0,0 +1,148 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ui_fzgf_wl1
+  m_Shader: {fileID: 4800000, guid: 7d5403880352cd348b8ca3d1f3a67447, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: ca1f245540fbeaa44925b44b3bf1137e, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Main_Tex:
+        m_Texture: {fileID: 2800000, guid: 95e602e250156af468901ae4f4b3fa00, type: 3}
+        m_Scale: {x: 1, y: 4}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 2800000, guid: f77f8f8d7482c1b44b0dad32ff004bec, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Noise94:
+        m_Texture: {fileID: 2800000, guid: bfcfae059f1e1884f97acc795fe3af1b, type: 3}
+        m_Scale: {x: 0.63, y: 0.2}
+        m_Offset: {x: 0, y: 0}
+    - _RJraodong:
+        m_Texture: {fileID: 2800000, guid: 8dd972cbb6cdc024a9da718d46ea3dfc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Rj2Tex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TextureGao:
+        m_Texture: {fileID: 2800000, guid: 21c0294d6ec1f9c47980c8c890eaf624, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Turb_Noise:
+        m_Texture: {fileID: 2800000, guid: 38a4e7dc480d0ec42ad7228c1b113799, type: 3}
+        m_Scale: {x: 1, y: 2}
+        m_Offset: {x: 0, y: 0}
+    - _dissolve:
+        m_Texture: {fileID: 2800000, guid: 893077602610eaf4e9b93d85a92b7323, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _rj2:
+        m_Texture: {fileID: 2800000, guid: 40ce12562f100a14eb5a661cb9774fbc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 1
+    - _AlphaCutoff: 0.5
+    - _AlphaQD: 1
+    - _CTime: 1
+    - _ColorMask: 0
+    - _CustomDataDissolve: 0
+    - _CustomDataMainUV: 0
+    - _CustomDataMainUV1: 0
+    - _DissSoft: 0.3
+    - _Diss_value: 0
+    - _Float0: 0.6
+    - _Float2: 0.684
+    - _Float3: 0.323
+    - _Float4: 0
+    - _Float7: 0.21
+    - _Float8: 0.118
+    - _Liangbu: 0.16
+    - _MainAlpha: 0
+    - _MainSpeedU: 0
+    - _MainSpeedV: -0.3
+    - _MainTexOffsetU: 0
+    - _MainTexOffsetV: 0
+    - _MainTilingU: 2
+    - _MainTilingV: 0.3
+    - _MaskSpeedU: 0.5
+    - _MaskSpeedV: 0.5
+    - _MaskTexOffsetU: 0
+    - _MaskTexOffsetV: 0
+    - _MaskTilingU: 1
+    - _MaskTilingV: 1
+    - _MaskTimeSpeedON1: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _RJ1soft: 0
+    - _RJ2soft: 0
+    - _RJraodongqd: 0.3
+    - _RJraodongsd: 0.1
+    - _ReceiveShadows: 0
+    - _Soft_value: 0
+    - _Stencil: 0
+    - _StencilComp: 0
+    - _StencilOp: 0
+    - _StencilReadMask: 0
+    - _StencilWriteMask: 0
+    - _TimeSpeedON: 1
+    - _Turb_Value: 0.75
+    - _alpha: 1
+    - _ca: 1
+    - _lerp: 0.5
+    - _light: 1
+    - _power: 5
+    - _soft: 0
+    - _zhongjian: 0.92
+    m_Colors:
+    - _Color: {r: 4, g: 4, b: 4, a: 1}
+    - _Color0: {r: 0.2051282, g: 0.923077, b: 1, a: 1}
+    - _ColorGG: {r: 0.2594338, g: 0.2594338, b: 0.2594338, a: 1}
+    - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Main_Color: {r: 2.79544, g: 2.79544, b: 2.79544, a: 1}
+    - _Main_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _MaskUVSpeed: {r: 0, g: 0, b: 0, a: 0}
+    - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _Turb_UV: {r: 0, g: 0.5, b: 0, a: 0}
+  m_BuildTextureStacks: []

+ 8 - 0
Assets/Art/VFX/Materials/UIMat/ui_fzgf_wl1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Dn1OsSP4UijtMp8zFhJXmhCe8970xOjLOUZE9fBvao+wa4QbHRzbGYuFSzzD
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

文件差异内容过多而无法显示
+ 662 - 224
Assets/Art/cs3.scene


+ 2 - 1
Assets/Res/Config/EventConfig.json

@@ -1829,7 +1829,6 @@
         1001109,
         1001110,
         1001111,
-        1001112,
         102,
         103
       ],
@@ -1862,6 +1861,8 @@
         1001201,
         1001202,
         1001203,
+        1001204,
+        1001205,
         102,
         103
       ],

文件差异内容过多而无法显示
+ 178 - 159
Assets/Res/Config/EventLinkConfig.json


文件差异内容过多而无法显示
+ 1324 - 1324
Assets/Res/Config/LanguageChineseConfig.json


二进制
Excel2Json/Excel/EventConfig.xlsx


二进制
Excel2Json/Excel/Item.xlsx


二进制
Excel2Json/Excel/Language.xlsx


部分文件因为文件数量过多而无法显示