Merge commit '9a4d341a0579abd09a845a7f93ca6ea7c46e9662' into Taptap

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.34060562
+    - _Alpha: 0.71308184
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.4958967
     - _AlphaCutoff: 0.5
     - _ColorMask: 0
     - _EnableExternalAlpha: 0

Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.28432667
+    - _Alpha: 0.7521408
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.11569083
+    - _MainTexOffsetU: -0.3661571
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Assets/Res/Config/EventConfig.json

@@ -1432,7 +1432,7 @@
       "PrizeNums": [
         1,
         1,
-        3060
+        3030
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1463,7 +1463,7 @@
       "PrizeNums": [
         1,
         1,
-        3120
+        3060
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1500,7 +1500,7 @@
       "PrizeNums": [
         1,
         1,
-        3180
+        3090
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,
@@ -1532,7 +1532,7 @@
       "PrizeNums": [
         1,
         1,
-        3240
+        3150
       ],
       "RefreshProbability": 0,
       "RefreshCount": 0,

Assets/Res/Config/EventLinkConfig.json

@@ -12649,6 +12649,9 @@
       "DialogueType": 0,
       "EventID": 6014,
       "optionType": 1,
+      "optionPara1": [
+        103
+      ],
       "optionPara2": [
         5953
       ],
@@ -13038,6 +13041,9 @@
       "DialogueType": 0,
       "EventID": 6021,
       "optionType": 1,
+      "optionPara1": [
+        103
+      ],
       "optionPara2": [
         5981
       ],
@@ -14097,6 +14103,9 @@
       "DialogueType": 0,
       "EventID": 6041,
       "optionType": 1,
+      "optionPara1": [
+        103
+      ],
       "optionPara2": [
         6063
       ],
@@ -14408,6 +14417,9 @@
       "DialogueType": 0,
       "EventID": 6045,
       "optionType": 1,
+      "optionPara1": [
+        103
+      ],
       "optionPara2": [
         6091
       ],
@@ -14525,6 +14537,9 @@
       "DialogueType": 0,
       "EventID": 6051,
       "optionType": 1,
+      "optionPara1": [
+        103
+      ],
       "optionPara2": [
         6102
       ],
@@ -22674,6 +22689,18 @@
       "EventID": 9162,
       "optionType": 0,
       "ResultType": 0
+    },
+    {
+      "ID": 103,
+      "conciseEventMessage": 0,
+      "EventConditionMessage": 0,
+      "PreShow": 0,
+      "PreShowPar": 0,
+      "NPCID": 0,
+      "DialogueType": 0,
+      "EventID": 0,
+      "optionType": 0,
+      "ResultType": 0
     }
   ]
 }

Assets/Res/Config/GroupConfig.json

@@ -91,10 +91,10 @@
     {
       "ID": 1002,
       "GroupMonsterLevel": [
-        9
+        6
       ],
       "GroupMonster": [
-        9002
+        7001
       ]
     },
     {
@@ -395,7 +395,7 @@
     {
       "ID": 10001,
       "GroupMonsterLevel": [
-        250
+        210
       ],
       "GroupMonster": [
         9005

Assets/Res/Config/HeroModelConfig.json

@@ -586,10 +586,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 116,
-      "hp": 95,
+      "attack": 113,
+      "hp": 94,
       "def": 100,
-      "shield": 95,
+      "shield": 94,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -644,10 +644,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 95,
-      "hp": 117,
+      "attack": 93,
+      "hp": 114,
       "def": 100,
-      "shield": 117,
+      "shield": 114,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -702,10 +702,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 105,
-      "hp": 105,
+      "attack": 103,
+      "hp": 103,
       "def": 100,
-      "shield": 105,
+      "shield": 103,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -760,10 +760,10 @@
       "model": "Gw_Woman",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 126,
-      "hp": 88,
+      "attack": 124,
+      "hp": 86,
       "def": 100,
-      "shield": 88,
+      "shield": 86,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -818,10 +818,10 @@
       "model": "Gw_Man",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 84,
-      "hp": 131,
+      "attack": 82,
+      "hp": 129,
       "def": 100,
-      "shield": 131,
+      "shield": 129,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -876,10 +876,10 @@
       "model": "Boss_ShuGuai",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 121,
-      "hp": 91,
+      "attack": 118,
+      "hp": 90,
       "def": 100,
-      "shield": 91,
+      "shield": 90,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -934,10 +934,10 @@
       "model": "Boss_QiongQi",
       "isUseGpu": false,
       "heroType": 3,
-      "attack": 110,
-      "hp": 100,
+      "attack": 108,
+      "hp": 98,
       "def": 100,
-      "shield": 100,
+      "shield": 98,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -992,10 +992,10 @@
       "model": "Boss01",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 104,
-      "hp": 138,
+      "attack": 110,
+      "hp": 77,
       "def": 100,
-      "shield": 94,
+      "shield": 110,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1050,10 +1050,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 58,
-      "hp": 115,
+      "attack": 110,
+      "hp": 55,
       "def": 100,
-      "shield": 115,
+      "shield": 110,
       "speed_atk": 2.0,
       "Linggen": [
         100,
@@ -1108,10 +1108,10 @@
       "model": "Boss_BeiHaiGui",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 58,
-      "hp": 104,
-      "def": 200,
-      "shield": 104,
+      "attack": 88,
+      "hp": 138,
+      "def": 100,
+      "shield": 138,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1166,10 +1166,10 @@
       "model": "Boss_Tree",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 81,
-      "hp": 104,
+      "attack": 110,
+      "hp": 110,
       "def": 100,
-      "shield": 104,
+      "shield": 110,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1224,10 +1224,10 @@
       "model": "Nanzhu",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 104,
-      "hp": 128,
+      "attack": 110,
+      "hp": 110,
       "def": 100,
-      "shield": 128,
+      "shield": 110,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1282,10 +1282,10 @@
       "model": "Boss_fenghuang",
       "isUseGpu": false,
       "heroType": 4,
-      "attack": 104,
-      "hp": 128,
+      "attack": 132,
+      "hp": 92,
       "def": 100,
-      "shield": 128,
+      "shield": 92,
       "speed_atk": 0.0,
       "Linggen": [
         100,
@@ -1331,6 +1331,64 @@
         -1
       ],
       "heroStory": 0
+    },
+    {
+      "ID": 7001,
+      "nickName": -1,
+      "name": 18,
+      "headicon": "icon_tx9002",
+      "model": "Boss_fenghuang",
+      "isUseGpu": false,
+      "heroType": 2,
+      "attack": 95,
+      "hp": 48,
+      "def": 100,
+      "shield": 95,
+      "speed_atk": 2.0,
+      "Linggen": [
+        100,
+        100,
+        100,
+        100,
+        100
+      ],
+      "skillID": [
+        9011,
+        -1,
+        9013,
+        9014,
+        -1,
+        9012,
+        -1,
+        -1,
+        9015,
+        9015
+      ],
+      "skillActiveLv": [
+        1,
+        1,
+        1,
+        -1,
+        -1,
+        -1,
+        -1,
+        -1,
+        1,
+        1
+      ],
+      "fa_bao_id": [
+        -1,
+        -1,
+        -1,
+        -1
+      ],
+      "fabaoActiveLv": [
+        1,
+        -1,
+        1,
+        -1
+      ],
+      "heroStory": 0
     }
   ]
 }

Assets/Resources/bg_appicon.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DHMZsSL4Uyl+0Mimy0z8OPEVV5G0f2IvNYTEzPHPmT0OYxx/vCE9Dd7pGGJX
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: OpenHarmony
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/GameUI/UI/DialoguePanel/DialogueOptionWidget.cs

@@ -45,7 +45,7 @@ namespace Fort23.Mono
             this.callback = callback;
             
 
-            if (!EventSystemManager.Instance.CeekEventGroupComplete(eventLinkData.eventConditions))
+            if (eventLinkData != null &&!EventSystemManager.Instance.CeekEventGroupComplete(eventLinkData.eventConditions))
             {
                 transform.Gray();
             }

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -403,7 +403,7 @@ namespace Fort23.Mono
 
         private async void SelectOption(DialogueOptionWidget obj)
         {
-            if (!EventSystemManager.Instance.CeekEventGroupComplete(obj.eventLinkData.eventConditions))
+            if (obj.eventLinkData != null && !EventSystemManager.Instance.CeekEventGroupComplete(obj.eventLinkData.eventConditions)  )
             {
                 bool isOk = await EventTipsPanel.OpenPanel(obj.eventLinkData);