Commit Graph

11686 Commits (e484b2bac85cc8150ae62f1cca0abff98911f0d4)
 

Author SHA1 Message Date
jiaoyangna e484b2bac8 星力聚灵资源提交 2022-01-06 16:15:49 +08:00
jiaoyangna 757c436878 编队预设提交 2022-01-06 16:12:10 +08:00
jiaoyangna b1be355601 Merge branch 'tansuo' into china/dev
# Conflicts:
#	Assets/ManagedResources/Atlas/ExploreAtlas.meta
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
2022-01-06 16:07:59 +08:00
jiaoyangna ac7a0a5ce6 资源提交 2022-01-06 15:38:24 +08:00
wangzhenxing f89526d96a [战斗]===========被动新增 414 -417 2022-01-06 15:30:40 +08:00
jiaoyangna f3349ca4d1 【ID1010966】
【优化】法宝聚灵调整
2022-01-06 15:18:30 +08:00
jiaoyangna 9c1eb41856 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-06 14:52:22 +08:00
jiaoyangna 79364232f0 【ID1010966】
【优化】法宝聚灵调整
2022-01-06 14:52:02 +08:00
gaoxin 7c0726e5b9 【神将详情】根据魂印的显示修改界面的大小 2022-01-06 12:03:35 +08:00
jiaoyangna c8b604bde4 【ID1011007】
【优化】功能开启增加新条件类型
2022-01-06 11:30:35 +08:00
jiaoyangna 130e38f5b2 【ID1011007】
【优化】功能开启增加新条件类型
2022-01-06 10:29:32 +08:00
jiaoyangna e9bfed6ab6 添加新的规则游戏报错修改 2022-01-06 10:20:27 +08:00
jiaoyangna 2b588340aa 【ID1019476】
【探索】称号遮挡复活中
2022-01-06 09:49:17 +08:00
jiaoyangna 27a96fa139 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-05 18:18:06 +08:00
jiaoyangna 2a8b4bca8c 【ID1010994】
增加单笔充值活动
2022-01-05 18:17:36 +08:00
gaoxin 662ad26223 【优化】心魔/四灵试炼增加编队按钮 2022-01-05 17:25:39 +08:00
jiaoyangna 8ab7558cac Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-05 15:38:23 +08:00
jiaoyangna 6ca1e17d52 【ID1010994】
增加单笔充值活动
2022-01-05 15:38:02 +08:00
ZhangBiao 792a85407b 【坐骑】不显示修改 2022-01-05 11:00:59 +08:00
ZhangBiao 18ee882c96 Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev 2022-01-04 16:58:07 +08:00
ZhangBiao 14044932b5 【命格】属性加成报错修改 2022-01-04 16:57:52 +08:00
jiaoyangna 7bfa7057ac 位置修改提交 2022-01-04 16:51:44 +08:00
jiaoyangna 7eade17002 提示位置修改提交 2022-01-04 16:47:24 +08:00
jiaoyangna 99014979b1 添加提示 2022-01-04 16:43:35 +08:00
jiaoyangna fb8de57afa 累计收益提交 2022-01-04 16:30:50 +08:00
jiaoyangna 1774e3d8bd 累计收益图片提交
(cherry picked from commit d33b2dad3b)
2022-01-04 16:29:02 +08:00
jiaoyangna d33b2dad3b 累计收益图片提交 2022-01-04 16:28:03 +08:00
jiaoyangna bc582b85e2 层级修改提交 2022-01-04 15:54:23 +08:00
gaoxin 5724728062 【职业筛选】颜色修改,添加混乱 2022-01-04 15:45:06 +08:00
jiaoyangna e079eff322 适配修改提交 2022-01-04 15:42:06 +08:00
gaoxin 9de91f4259 【修行】删除黄点显示 2022-01-04 14:30:22 +08:00
jiaoyangna ebc67f1602 战力修改提交 2022-01-04 14:21:54 +08:00
gaoxin c07ba438a0 【职业筛选】颜色修改 2022-01-04 14:07:15 +08:00
gaoxin ad8653d679 Merge branch '0优化/山河社稷图筛选显示' into china/dev 2022-01-04 13:22:22 +08:00
gaoxin 108252b8e4 【排行】修复显示异常 2022-01-04 10:20:37 +08:00
gaoxin 9b2057bede 【山河筛选】添加职业呼吸效果 2022-01-03 02:17:03 +08:00
jiaoyangna 5e28b8ad36 添加容错 2021-12-31 18:05:55 +08:00
gaoxin 0c9b3b4f96 【角色信息】修复回收立绘错误 2021-12-31 17:55:01 +08:00
gaoxin d1b84299c2 【修行优化】点击圆点弹出TIPS后,切换点击其他圆点应切换TIPS内容,而非关闭之前的TIPS 2022-01-03 02:43:00 +08:00
jiaoyangna fee12d7063 顶着复活中跑 2021-12-31 17:36:11 +08:00
jiaoyangna 330c34a0b8 探索地图人物切换修改 2021-12-31 16:32:08 +08:00
jiaoyangna 9880fcf8e8 地图中停止探索报错修改 2021-12-31 16:11:51 +08:00
jiaoyangna 17c6d0cdc7 地图小人挺住不动修改 2021-12-31 14:07:56 +08:00
jiaoyangna a35ad65ea3 添加容错 2021-12-31 13:49:48 +08:00
jiaoyangna 12049b61f8 探索地图报错修改 2021-12-31 12:23:46 +08:00
jiaoyangna 7a9d61e8c9 地图探索修改提交 2021-12-31 11:40:42 +08:00
jiaoyangna e6061c0762 一键上阵修改提交 2021-12-31 11:18:20 +08:00
jiaoyangna 90d1971b25 累计收益修改提交 2021-12-31 11:06:33 +08:00
jiaoyangna 6952b54a6c 累计收益修改提交 2021-12-31 10:48:22 +08:00
jiaoyangna af30beccd3 资源条跳转错误修改提交 2021-12-30 18:12:56 +08:00