zhangjiannan
|
19484d6b62
|
Merge remote-tracking branch 'remotes/origin/onepiece_bt' into TCX_LongZhu
# Conflicts:
# Assets/ManagedResources/Icon/Haizeiskill.meta
# Assets/ManagedResources/Icons/luofu_huobi_1.png
# Assets/ManagedResources/Icons/luofu_huobi_1.png.meta
# Assets/ManagedResources/Icons/luofu_huobi_2.png
# Assets/ManagedResources/Icons/luofu_huobi_2.png.meta
# Assets/ManagedResources/Icons/luofu_huobi_3.png
# Assets/ManagedResources/Icons/luofu_huobi_3.png.meta
# Assets/ManagedResources/Icons/luofu_huobi_4.png
# Assets/ManagedResources/Icons/luofu_huobi_4.png.meta
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/Prefabs/UI/GMPanel/GMShuaChongTeQuan.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTowerPanel.prefab
# Assets/ManagedResources/Prefabs/UI/NewActivity/EveryDayGiftNew.prefab
# Assets/ManagedResources/Prefabs/UI/QiJieShiLian/QiJieShiLianPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Ranking/RankingListMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/UppperMonthCardView/UppperMonthCard.prefab
# Assets/ManagedResources/Prefabs/UI/XunBaoMiZong/XunBaoMiZongPanel.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Language.lua
# Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
|
2024-10-11 16:36:50 +08:00 |
PC-202302260912\Administrator
|
971ba9b2a5
|
替换文字
|
2024-09-12 19:29:03 +08:00 |
wangzhenxing
|
6074cf7a38
|
罗浮编队提示修改
|
2024-06-18 15:16:45 +08:00 |
wangzhenxing
|
0d5d64dd04
|
罗浮争锋修改提交==================
|
2024-06-18 14:27:45 +08:00 |
wangzhenxing
|
ea592a85ad
|
修行挑战显示资源条修改
|
2024-01-24 18:06:10 +08:00 |
wangzhenxing
|
06a1b0ea97
|
四海试炼上阵界面修改
|
2024-01-15 19:11:29 +08:00 |
wangzhenxing
|
e4299072f4
|
名称替换
|
2023-12-07 00:09:44 +08:00 |
wangzhenxing
|
91b1bbb82c
|
遴选多队塔代码
|
2023-03-21 10:58:00 +08:00 |
wangzhenxing
|
6d55ae95d7
|
Revert "多队塔提交"
This reverts commit 4a411833a5 .
|
2023-03-20 11:42:40 +08:00 |
wangzhenxing
|
4a411833a5
|
多队塔提交
|
2023-03-20 11:22:44 +08:00 |
wangzhenxing
|
e3b1b3a967
|
[玉虚论道]=====星级,等级显示修改
|
2022-09-01 17:05:24 +08:00 |
yuanshuai
|
99ae5cb8ec
|
探索界面保存编队逻辑优化
|
2022-04-28 16:12:33 +08:00 |
yuanshuai
|
bf52645eb7
|
挑战副本优化
|
2022-04-25 18:20:53 +08:00 |
yuanshuai
|
804b2c3f4d
|
挑战副本bug修改
|
2022-04-19 16:50:03 +08:00 |
yuanshuai
|
3c72cd688b
|
挑战副本bug修改
|
2022-04-19 16:14:55 +08:00 |
yuanshuai
|
24bf6c63e4
|
挑战副本脚本修改
|
2022-04-19 15:52:50 +08:00 |
yuanshuai
|
b907383826
|
挑战副本脚本修改
|
2022-04-19 11:53:08 +08:00 |
yuanshuai
|
b4a626d9e2
|
挑战副本脚本修改提交
|
2022-04-18 18:48:06 +08:00 |
wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |
gaoxin
|
df2e07b0e3
|
【心魔编队】保存后自动关闭界面
|
2022-01-14 17:11:02 +08:00 |
gaoxin
|
1d3f9ad425
|
【四灵编队】开始战斗报错
|
2022-01-14 09:47:18 +08:00 |
gaoxin
|
e12ddf56c6
|
【编队筛选】修复呼吸闪烁
|
2022-01-08 14:50:34 +08:00 |
gaoxin
|
34e90db4fd
|
【编队删选】添加职业筛选效果,高亮效果颜色修改
|
2022-01-07 16:40:31 +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 |
gaoxin
|
662ad26223
|
【优化】心魔/四灵试炼增加编队按钮
|
2022-01-05 17:25:39 +08:00 |
gaoxin
|
5724728062
|
【职业筛选】颜色修改,添加混乱
|
2022-01-04 15:45:06 +08:00 |
gaoxin
|
c07ba438a0
|
【职业筛选】颜色修改
|
2022-01-04 14:07:15 +08:00 |
gaoxin
|
9b2057bede
|
【山河筛选】添加职业呼吸效果
|
2022-01-03 02:17:03 +08:00 |
jiaoyangna
|
e6061c0762
|
一键上阵修改提交
|
2021-12-31 11:18:20 +08:00 |
jiaoyangna
|
dac88a6dbf
|
探索提交
|
2021-12-29 10:02:22 +08:00 |
jiaoyangna
|
978689d9a7
|
探索提交
|
2021-12-28 17:52:28 +08:00 |
jiaoyangna
|
5e75e2384e
|
探索提交
|
2021-12-28 15:31:46 +08:00 |
jiaoyangna
|
9dafa85858
|
探索提交
|
2021-12-28 13:30:27 +08:00 |
jiaoyangna
|
5f9f7da264
|
探索提交
|
2021-12-24 17:49:54 +08:00 |
jiaoyangna
|
130a75c8dd
|
探索提交
|
2021-12-24 00:14:32 +08:00 |
jiaoyangna
|
5d37c0d4d9
|
探索提交
|
2021-12-23 17:23:02 +08:00 |
gaoxin
|
3835273079
|
【关卡】条件新增
|
2021-12-10 17:37:07 +08:00 |
ZhangBiao
|
cb80384f02
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-22 12:11:41 +08:00 |
ZhangBiao
|
421f82b882
|
【灵脉秘境】战斗报错修改
|
2021-11-22 12:11:28 +08:00 |
wangzhenxing
|
f10d6ee2a1
|
[玉虚论道]======保存队伍时添加相同英雄检测
|
2021-11-22 10:18:39 +08:00 |
ZhangBiao
|
9f356783e1
|
【灵脉秘境】提交
|
2021-11-19 17:01:10 +08:00 |
ZhangBiao
|
5e09e0b9a3
|
【灵脉秘境】切磋
|
2021-11-19 16:16:45 +08:00 |
ZhangBiao
|
7f0720554f
|
【灵脉秘境】提交
|
2021-11-18 14:31:57 +08:00 |
ZhangBiao
|
79d2113bc2
|
【灵脉秘境】提交
|
2021-11-18 14:10:57 +08:00 |
ZhangBiao
|
e174e24bc1
|
【灵脉秘境】提交
|
2021-11-18 10:26:14 +08:00 |
ZhangBiao
|
790fe1c88f
|
【灵脉秘境】提交
|
2021-11-17 18:28:59 +08:00 |
ZhangBiao
|
2b2a77a129
|
【灵脉秘境】提交
|
2021-11-17 16:14:47 +08:00 |
ZhangBiao
|
d8dd88b2e2
|
【灵脉秘境】提交
|
2021-11-16 18:30:08 +08:00 |
ZhangBiao
|
6012b533ca
|
【灵脉秘境】提交
|
2021-11-16 17:34:37 +08:00 |
ZhangBiao
|
c37386fada
|
【优化】轩辕宝境界面优化
|
2021-11-11 14:59:15 +08:00 |