zhangjiannan
|
a5f5894185
|
1
|
2024-11-12 16:22:23 +08:00 |
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
|
e8a1bf84da
|
推进城 改为宇宙生成挑战
|
2024-09-12 19:37:04 +08:00 |
wangzhenxing
|
7986f46dd2
|
罗浮修改
|
2024-06-18 15:54:02 +08:00 |
wangzhenxing
|
6669c2edbd
|
Merge branch 'onepiece_demo' into onepiece_demo_arena
|
2024-02-22 13:15:35 +08:00 |
xiejun
|
e5a2d06c63
|
修改灵脉秘境字段
|
2024-02-21 15:01:32 +08:00 |
wangzhenxing
|
76cd9f8354
|
新竞技场提交
|
2024-02-05 19:00:08 +08:00 |
wangzhenxing
|
7e7f3849b9
|
玩家信息界面修改
|
2024-01-30 18:34:38 +08:00 |
wangzhenxing
|
dbfa637e98
|
英雄信息界面修改
|
2024-01-30 14:35:33 +08:00 |
wangzhenxing
|
3079280262
|
罗浮争锋名称修改
|
2024-01-22 18:01:26 +08:00 |
wangzhenxing
|
6a053ea36f
|
副本排行榜描述修改
|
2024-01-20 20:26:09 +08:00 |
wangzhenxing
|
9dc40bc57e
|
玩家详情界面修改
|
2024-01-15 16:59:11 +08:00 |
wangzhenxing
|
030431e3fc
|
合并0.1新功能修改
|
2024-01-03 15:24:49 +08:00 |
wangzhenxing
|
0ec0ccc6b2
|
玩家界面修改提交
|
2023-11-03 18:43:17 +08:00 |
wangzhenxing
|
a66437ec72
|
潜能提交
|
2023-10-16 15:12:47 +08:00 |
wangzhenxing
|
1e1fd36489
|
玩家信息界面修改
|
2023-09-28 16:00:26 +08:00 |
wangzhenxing
|
600f270128
|
礼物添加总属性显示,逍遥游寻仙修改
|
2023-09-19 18:03:00 +08:00 |
wangzhenxing
|
049cebd574
|
灵兽星际显示修改提交
|
2023-09-15 13:56:38 +08:00 |
wangzhenxing
|
e80056fcd4
|
查看礼物信息提交
|
2023-09-13 15:44:06 +08:00 |
wangzhenxing
|
eeb3859f72
|
礼物功能提交
|
2023-09-13 14:57:48 +08:00 |
wangzhenxing
|
18e10b4fb6
|
命格修改提交
|
2023-08-31 19:12:02 +08:00 |
wangzhenxing
|
a2ed294523
|
英雄信息界面变身卡星级显示修改
|
2023-08-16 11:36:58 +08:00 |
wangzhenxing
|
a753de6a59
|
神兵技能信息预设修改提交
|
2023-03-30 13:11:09 +08:00 |
wangzhenxing
|
207c1f3426
|
神兵信息弹窗修改提交
|
2023-03-29 17:21:33 +08:00 |
wangzhenxing
|
10fee38b64
|
神兵提交
|
2023-03-29 10:48:35 +08:00 |
yuanshuai
|
0d44032d25
|
灵脉修改
|
2023-02-20 15:06:47 +08:00 |
yuanshuai
|
97678fc79c
|
身外化身修改提交
|
2022-07-20 14:26:09 +08:00 |
yuanshuai
|
4199ea504a
|
查看其他玩家信息,变身卡信息不对bug
|
2022-04-26 17:20:19 +08:00 |
wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |
gaoxin
|
1d3ef22dac
|
【玩家信息】兼容以前
|
2022-03-04 18:26:36 +08:00 |
gaoxin
|
51b829874d
|
【角色信息】所有跨服查看信息的不再可以添加好友和黑名单,修复跨服信息显示错误
|
2022-03-04 18:13:16 +08:00 |
wangzhenxing
|
e734c4a03d
|
[飞升]=======飞升修改
|
2022-01-20 11:41:20 +08:00 |
wangzhenxing
|
9831008684
|
[飞升]======飞升特效适配
|
2022-01-19 18:34:35 +08:00 |
wangzhenxing
|
a7ad2ee1f6
|
Merge branch 'china/dev' into china/飞升
|
2022-01-17 10:50:14 +08:00 |
ZhangBiao
|
a556bf7761
|
【玩家信息】提交
|
2022-01-15 18:17:46 +08:00 |
wangzhenxing
|
0b3007a9c7
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-15 18:16:56 +08:00 |
ZhangBiao
|
3ad8b6b6c3
|
【玩家信息】提交
|
2022-01-15 15:44:08 +08:00 |
ZhangBiao
|
c373f8d014
|
【修改】提交
|
2022-01-15 15:05:26 +08:00 |
ZhangBiao
|
bca67f4fd6
|
【玩家信息】报错修改
|
2022-01-15 13:26:22 +08:00 |
ZhangBiao
|
28d3f421bc
|
【玩家信息优化】玩家信息中新增身外化身,四象心法,命格和坐骑信息提交
|
2022-01-14 15:44:45 +08:00 |
ZhangBiao
|
5b36346da3
|
【玩家信息】提交
|
2022-01-13 18:29:12 +08:00 |
ZhangBiao
|
36b475ee15
|
【玩家信息】增加额外属性
|
2022-01-13 15:23:59 +08:00 |
wangzhenxing
|
1b39fbdbe9
|
【飞升】===========神魂后星级显示修改
|
2022-01-10 15:11:30 +08:00 |
wangzhenxing
|
5b670023ed
|
[飞升]=======飞升代码逻辑提交
|
2022-01-05 18:17:44 +08:00 |
ZhangBiao
|
f4febd8ed8
|
【灵脉秘境】竞技场pvp切磋报错修改
|
2021-11-22 17:20:04 +08:00 |
gaoxin
|
e800f29b33
|
【竞技场】查看玩家信息报错
|
2021-11-22 16:06:52 +08:00 |
ZhangBiao
|
95f71667fe
|
【灵脉秘境】提交
|
2021-11-19 17:23:06 +08:00 |
ZhangBiao
|
5e09e0b9a3
|
【灵脉秘境】切磋
|
2021-11-19 16:16:45 +08:00 |
ZhangBiao
|
79d2113bc2
|
【灵脉秘境】提交
|
2021-11-18 14:10:57 +08:00 |
ZhangBiao
|
03cdea5c83
|
【灵脉秘境】纪录提交
|
2021-11-18 11:35:20 +08:00 |