Browse Source

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

DESKTOP-FB72PO8\Administrator 1 day ago
parent
commit
af23349795
32 changed files with 66 additions and 66 deletions
  1. 2 2
      Assets/Res/Config/EventConfig.json
  2. 1 1
      Assets/Res/Config/LanguageChineseConfig.json
  3. 63 63
      Assets/Res/Config/MitigationParaConfig.json
  4. BIN
      Excel2Json/Excel/EventConfig.xlsx
  5. BIN
      Excel2Json/Excel/Language.xlsx
  6. BIN
      Excel2Json/Excel/mitigationParaConfig.xlsx
  7. BIN
      美术/art_use_ui/bg/bg_fanti_appicon.png
  8. BIN
      美术/art_use_ui/bg/bg_fanti_cj_kaichang2.png
  9. BIN
      美术/art_use_ui/bg/bg_fanti_logo.png
  10. BIN
      美术/art_use_ui/bg/bg_fanti_shengli.png
  11. BIN
      美术/art_use_ui/bg/bg_fanti_shibai.png
  12. BIN
      美术/art_use_ui/chouka/dec_fanti_xiaolvdai.png
  13. BIN
      美术/art_use_ui/chouka/dec_kaiqitiaozhan_db.png
  14. BIN
      美术/art_use_ui/chouka/dec_lingqu_db.png
  15. BIN
      美术/art_use_ui/daoju/dec_daijinquan_big.png
  16. BIN
      美术/art_use_ui/daoju/dec_fanti_daijinquan_big.png
  17. BIN
      美术/art_use_ui/daoju/dec_fanti_daijinquan_mid.png
  18. BIN
      美术/art_use_ui/daoju/dec_fanti_daijinquan_small.png
  19. BIN
      美术/art_use_ui/daoju/icon_fanti_Demo_Gem04.png
  20. BIN
      美术/art_use_ui/jingjie/dec_fanti_dujieshibai.png
  21. BIN
      美术/art_use_ui/jingjie/dec_fanti_tuposhibai.png
  22. BIN
      美术/art_use_ui/jingjie/dec_fanti_zi_jjym.png
  23. BIN
      美术/art_use_ui/shenshi/dec_fanti_shenshi_dengji_ling.png
  24. BIN
      美术/art_use_ui/shenshi/dec_fanti_shenshi_dengji_sheng.png
  25. BIN
      美术/art_use_ui/shenshi/dec_fanti_shenshi_dengji_yi.png
  26. BIN
      美术/art_use_ui/tongyong/dec_fanti_fuzhu2.png
  27. BIN
      美术/art_use_ui/tongyong/icon_fanti_xinjing1zi.png
  28. BIN
      美术/art_use_ui/tongyong/icon_fanti_xinjing2zi.png
  29. BIN
      美术/art_use_ui/tongyong/icon_fanti_xinjing4zi.png
  30. BIN
      美术/art_use_ui/tongyong/icon_fanti_xinjing6zi.png
  31. BIN
      美术/art_use_ui/tongyong/icon_fanti_xinjing7zi.png
  32. BIN
      美术/商店所需/app图标繁体.png

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

@@ -4992,7 +4992,7 @@
         2500,
         2500,
         500
         500
       ],
       ],
-      "RefreshProbability": 35,
+      "RefreshProbability": 45,
       "RefreshCount": 1,
       "RefreshCount": 1,
       "placeID": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
       "SmallPlacesId": 0,
@@ -5032,7 +5032,7 @@
         2700,
         2700,
         550
         550
       ],
       ],
-      "RefreshProbability": 35,
+      "RefreshProbability": 40,
       "RefreshCount": 1,
       "RefreshCount": 1,
       "placeID": 1,
       "placeID": 1,
       "SmallPlacesId": 0,
       "SmallPlacesId": 0,

+ 1 - 1
Assets/Res/Config/LanguageChineseConfig.json

@@ -40198,7 +40198,7 @@
     },
     },
     {
     {
       "ID": 10790,
       "ID": 10790,
-      "txt": "道友在大地图中有概率和你相遇,并有概率获得道友送你的以下礼物"
+      "txt": "在神识探索中结识的道友,好感度达到一定等级后每段时间都有概率赠送物品"
     },
     },
     {
     {
       "ID": 10791,
       "ID": 10791,

+ 63 - 63
Assets/Res/Config/MitigationParaConfig.json

@@ -150,255 +150,255 @@
     },
     },
     {
     {
       "ID": 38,
       "ID": 38,
-      "mitigationPara": 112.0
+      "mitigationPara": 112.052635
     },
     },
     {
     {
       "ID": 39,
       "ID": 39,
-      "mitigationPara": 111.0
+      "mitigationPara": 111.153847
     },
     },
     {
     {
       "ID": 40,
       "ID": 40,
-      "mitigationPara": 110.0
+      "mitigationPara": 110.3
     },
     },
     {
     {
       "ID": 41,
       "ID": 41,
-      "mitigationPara": 109.0
+      "mitigationPara": 109.487808
     },
     },
     {
     {
       "ID": 42,
       "ID": 42,
-      "mitigationPara": 108.0
+      "mitigationPara": 108.714287
     },
     },
     {
     {
       "ID": 43,
       "ID": 43,
-      "mitigationPara": 107.0
+      "mitigationPara": 107.976746
     },
     },
     {
     {
       "ID": 44,
       "ID": 44,
-      "mitigationPara": 106.0
+      "mitigationPara": 107.272728
     },
     },
     {
     {
       "ID": 45,
       "ID": 45,
-      "mitigationPara": 105.0
+      "mitigationPara": 106.6
     },
     },
     {
     {
       "ID": 46,
       "ID": 46,
-      "mitigationPara": 104.0
+      "mitigationPara": 105.95652
     },
     },
     {
     {
       "ID": 47,
       "ID": 47,
-      "mitigationPara": 103.0
+      "mitigationPara": 105.340424
     },
     },
     {
     {
       "ID": 48,
       "ID": 48,
-      "mitigationPara": 102.0
+      "mitigationPara": 104.75
     },
     },
     {
     {
       "ID": 49,
       "ID": 49,
-      "mitigationPara": 101.0
+      "mitigationPara": 104.18367
     },
     },
     {
     {
       "ID": 50,
       "ID": 50,
-      "mitigationPara": 100.02
+      "mitigationPara": 103.64
     },
     },
     {
     {
       "ID": 51,
       "ID": 51,
-      "mitigationPara": 99.05882
+      "mitigationPara": 103.117645
     },
     },
     {
     {
       "ID": 52,
       "ID": 52,
-      "mitigationPara": 98.1075
+      "mitigationPara": 102.615387
     },
     },
     {
     {
       "ID": 53,
       "ID": 53,
-      "mitigationPara": 97.18434
+      "mitigationPara": 102.132072
     },
     },
     {
     {
       "ID": 54,
       "ID": 54,
-      "mitigationPara": 96.28778
+      "mitigationPara": 101.666664
     },
     },
     {
     {
       "ID": 55,
       "ID": 55,
-      "mitigationPara": 95.41637
+      "mitigationPara": 101.218185
     },
     },
     {
     {
       "ID": 56,
       "ID": 56,
-      "mitigationPara": 94.56875
+      "mitigationPara": 100.785713
     },
     },
     {
     {
       "ID": 57,
       "ID": 57,
-      "mitigationPara": 93.74368
+      "mitigationPara": 100.368423
     },
     },
     {
     {
       "ID": 58,
       "ID": 58,
-      "mitigationPara": 92.94
+      "mitigationPara": 99.9655151
     },
     },
     {
     {
       "ID": 59,
       "ID": 59,
-      "mitigationPara": 92.15661
+      "mitigationPara": 99.57627
     },
     },
     {
     {
       "ID": 60,
       "ID": 60,
-      "mitigationPara": 91.3925
+      "mitigationPara": 99.2
     },
     },
     {
     {
       "ID": 61,
       "ID": 61,
-      "mitigationPara": 90.64672
+      "mitigationPara": 98.83607
     },
     },
     {
     {
       "ID": 62,
       "ID": 62,
-      "mitigationPara": 89.91839
+      "mitigationPara": 98.48387
     },
     },
     {
     {
       "ID": 63,
       "ID": 63,
-      "mitigationPara": 89.206665
+      "mitigationPara": 98.14286
     },
     },
     {
     {
       "ID": 64,
       "ID": 64,
-      "mitigationPara": 88.51078
+      "mitigationPara": 97.8125
     },
     },
     {
     {
       "ID": 65,
       "ID": 65,
-      "mitigationPara": 87.83
+      "mitigationPara": 97.49231
     },
     },
     {
     {
       "ID": 66,
       "ID": 66,
-      "mitigationPara": 87.1636353
+      "mitigationPara": 97.1818161
     },
     },
     {
     {
       "ID": 67,
       "ID": 67,
-      "mitigationPara": 86.51105
+      "mitigationPara": 96.8806
     },
     },
     {
     {
       "ID": 68,
       "ID": 68,
-      "mitigationPara": 85.87162
+      "mitigationPara": 96.5882339
     },
     },
     {
     {
       "ID": 69,
       "ID": 69,
-      "mitigationPara": 85.24478
+      "mitigationPara": 96.3043442
     },
     },
     {
     {
       "ID": 70,
       "ID": 70,
-      "mitigationPara": 84.63
+      "mitigationPara": 96.02857
     },
     },
     {
     {
       "ID": 71,
       "ID": 71,
-      "mitigationPara": 84.0267639
+      "mitigationPara": 95.76057
     },
     },
     {
     {
       "ID": 72,
       "ID": 72,
-      "mitigationPara": 83.4345856
+      "mitigationPara": 95.5
     },
     },
     {
     {
       "ID": 73,
       "ID": 73,
-      "mitigationPara": 82.85301
+      "mitigationPara": 95.2465744
     },
     },
     {
     {
       "ID": 74,
       "ID": 74,
-      "mitigationPara": 82.2816238
+      "mitigationPara": 95.0
     },
     },
     {
     {
       "ID": 75,
       "ID": 75,
-      "mitigationPara": 81.72
+      "mitigationPara": 94.76
     },
     },
     {
     {
       "ID": 76,
       "ID": 76,
-      "mitigationPara": 81.16776
+      "mitigationPara": 94.52631
     },
     },
     {
     {
       "ID": 77,
       "ID": 77,
-      "mitigationPara": 80.62454
+      "mitigationPara": 94.2987
     },
     },
     {
     {
       "ID": 78,
       "ID": 78,
-      "mitigationPara": 80.09
+      "mitigationPara": 94.07692
     },
     },
     {
     {
       "ID": 79,
       "ID": 79,
-      "mitigationPara": 79.5638
+      "mitigationPara": 93.8607559
     },
     },
     {
     {
       "ID": 80,
       "ID": 80,
-      "mitigationPara": 79.04562
+      "mitigationPara": 93.65
     },
     },
     {
     {
       "ID": 81,
       "ID": 81,
-      "mitigationPara": 78.53519
+      "mitigationPara": 93.44444
     },
     },
     {
     {
       "ID": 82,
       "ID": 82,
-      "mitigationPara": 78.032196
+      "mitigationPara": 93.2439041
     },
     },
     {
     {
       "ID": 83,
       "ID": 83,
-      "mitigationPara": 77.5363846
+      "mitigationPara": 93.0481949
     },
     },
     {
     {
       "ID": 84,
       "ID": 84,
-      "mitigationPara": 77.0475
+      "mitigationPara": 92.85714
     },
     },
     {
     {
       "ID": 85,
       "ID": 85,
-      "mitigationPara": 76.56529
+      "mitigationPara": 92.6705856
     },
     },
     {
     {
       "ID": 86,
       "ID": 86,
-      "mitigationPara": 76.08954
+      "mitigationPara": 92.48837
     },
     },
     {
     {
       "ID": 87,
       "ID": 87,
-      "mitigationPara": 75.62
+      "mitigationPara": 92.31035
     },
     },
     {
     {
       "ID": 88,
       "ID": 88,
-      "mitigationPara": 75.15648
+      "mitigationPara": 92.13636
     },
     },
     {
     {
       "ID": 89,
       "ID": 89,
-      "mitigationPara": 74.69876
+      "mitigationPara": 91.96629
     },
     },
     {
     {
       "ID": 90,
       "ID": 90,
-      "mitigationPara": 74.246666
+      "mitigationPara": 91.8
     },
     },
     {
     {
       "ID": 91,
       "ID": 91,
-      "mitigationPara": 73.8
+      "mitigationPara": 91.63736
     },
     },
     {
     {
       "ID": 92,
       "ID": 92,
-      "mitigationPara": 73.35859
+      "mitigationPara": 91.4782639
     },
     },
     {
     {
       "ID": 93,
       "ID": 93,
-      "mitigationPara": 72.92226
+      "mitigationPara": 91.32258
     },
     },
     {
     {
       "ID": 94,
       "ID": 94,
-      "mitigationPara": 72.49085
+      "mitigationPara": 91.17021
     },
     },
     {
     {
       "ID": 95,
       "ID": 95,
-      "mitigationPara": 72.06421
+      "mitigationPara": 91.02105
     },
     },
     {
     {
       "ID": 96,
       "ID": 96,
-      "mitigationPara": 71.64219
+      "mitigationPara": 90.875
     },
     },
     {
     {
       "ID": 97,
       "ID": 97,
-      "mitigationPara": 71.22464
+      "mitigationPara": 90.73196
     },
     },
     {
     {
       "ID": 98,
       "ID": 98,
-      "mitigationPara": 70.81143
+      "mitigationPara": 90.591835
     },
     },
     {
     {
       "ID": 99,
       "ID": 99,
-      "mitigationPara": 70.40243
+      "mitigationPara": 90.4545441
     },
     },
     {
     {
       "ID": 100,
       "ID": 100,
-      "mitigationPara": 69.9975
+      "mitigationPara": 90.32
     }
     }
   ]
   ]
 }
 }

BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/mitigationParaConfig.xlsx


BIN
美术/art_use_ui/bg/bg_fanti_appicon.png


BIN
美术/art_use_ui/bg/bg_fanti_cj_kaichang2.png


BIN
美术/art_use_ui/bg/bg_fanti_logo.png


BIN
美术/art_use_ui/bg/bg_fanti_shengli.png


BIN
美术/art_use_ui/bg/bg_fanti_shibai.png


BIN
美术/art_use_ui/chouka/dec_fanti_xiaolvdai.png


BIN
美术/art_use_ui/chouka/dec_kaiqitiaozhan_db.png


BIN
美术/art_use_ui/chouka/dec_lingqu_db.png


BIN
美术/art_use_ui/daoju/dec_daijinquan_big.png


BIN
美术/art_use_ui/daoju/dec_fanti_daijinquan_big.png


BIN
美术/art_use_ui/daoju/dec_fanti_daijinquan_mid.png


BIN
美术/art_use_ui/daoju/dec_fanti_daijinquan_small.png


BIN
美术/art_use_ui/daoju/icon_fanti_Demo_Gem04.png


BIN
美术/art_use_ui/jingjie/dec_fanti_dujieshibai.png


BIN
美术/art_use_ui/jingjie/dec_fanti_tuposhibai.png


BIN
美术/art_use_ui/jingjie/dec_fanti_zi_jjym.png


BIN
美术/art_use_ui/shenshi/dec_fanti_shenshi_dengji_ling.png


BIN
美术/art_use_ui/shenshi/dec_fanti_shenshi_dengji_sheng.png


BIN
美术/art_use_ui/shenshi/dec_fanti_shenshi_dengji_yi.png


BIN
美术/art_use_ui/tongyong/dec_fanti_fuzhu2.png


BIN
美术/art_use_ui/tongyong/icon_fanti_xinjing1zi.png


BIN
美术/art_use_ui/tongyong/icon_fanti_xinjing2zi.png


BIN
美术/art_use_ui/tongyong/icon_fanti_xinjing4zi.png


BIN
美术/art_use_ui/tongyong/icon_fanti_xinjing6zi.png


BIN
美术/art_use_ui/tongyong/icon_fanti_xinjing7zi.png


BIN
美术/商店所需/app图标繁体.png