wangzhenxing
|
c3334a5d98
|
更换名称
|
2023-12-07 01:11:27 +08:00 |
xiejun
|
6ced2b0507
|
Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-08-29 17:58:24 +08:00 |
wangzhenxing
|
42aeb38e6f
|
多队塔编对修改提交
|
2023-04-20 13:13:22 +08:00 |
wangzhenxing
|
6d3fe931d3
|
[神兵]==============修改提交
|
2023-04-12 11:31:04 +08:00 |
wangzhenxing
|
a2726648ff
|
多队塔战斗判定修改提交
|
2023-03-23 16:57:29 +08:00 |
wangzhenxing
|
f65a4314d1
|
多队塔胜利条件修改
|
2023-03-23 10:43:53 +08:00 |
wangzhenxing
|
1fa9ba8050
|
多队塔详情界面挑战添加限制
|
2023-03-22 18:26:47 +08:00 |
wangzhenxing
|
04a84da290
|
多队塔红点提交
|
2023-03-22 14:58:19 +08:00 |
wangzhenxing
|
614ec0b6e1
|
多队塔排行榜显示修改提交
|
2023-03-22 10:45:26 +08:00 |
wangzhenxing
|
4848d707ff
|
多队塔修改提交
|
2023-03-21 16:12:57 +08:00 |
wangzhenxing
|
91b1bbb82c
|
遴选多队塔代码
|
2023-03-21 10:58:00 +08:00 |
wangzhenxing
|
82ba7d45c4
|
Merge branch 'china/dev_bt' into china/dev_bt_develop
Conflicts:
Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayOtherTeamPanel.prefab
Assets/ManagedResources/Prefabs/UI/GodsWay/GodsWayTreasurePanel.prefab
Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua
Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/GodsWayTreasurePanel.lua
Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayOtherTeamPanel.lua
Assets/ManagedResources/~Lua/View/GodsWaySingleSingleWave.lua
|
2023-03-21 10:39:18 +08:00 |
wangzhenxing
|
6f9af97445
|
多队塔提交
|
2023-03-21 10:11:06 +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
|
693774b012
|
玉虚论道修改
|
2023-01-13 14:00:37 +08:00 |
wangzhenxing
|
59b4801c07
|
玉虚论道星级修改
|
2023-01-13 13:44:12 +08:00 |
wangzhenxing
|
051b6ae456
|
[玉虚]===他人阵容英雄背景框修改
|
2022-09-02 14:10:01 +08:00 |
wangzhenxing
|
c5921ae680
|
[玉虚论道]=====编队英雄详情修改提交
|
2022-09-02 13:58:13 +08:00 |
wangzhenxing
|
bdc2cd7ef9
|
[玉虚论道]=====玉虚论道修改
|
2022-09-01 18:15:08 +08:00 |
wangzhenxing
|
e3b1b3a967
|
[玉虚论道]=====星级,等级显示修改
|
2022-09-01 17:05:24 +08:00 |
wangzhenxing
|
1c715438c8
|
[玉虚论道]=======开战添加相同神将屏蔽提示
|
2022-05-25 13:58:31 +08:00 |
wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |
wangzhenxing
|
ef0a0ff436
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab
Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroAndEquipListPanel.prefab
Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Passivity.lua
Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroAndEquipListPanel.lua
Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua
|
2022-01-15 12:47:22 +08:00 |
wangzhenxing
|
853fde91b2
|
[飞升]============飞升修改提交
|
2022-01-15 12:26:12 +08:00 |
wangzhenxing
|
ff7b7ba5ed
|
[飞升]=====bug修改提交
|
2022-01-12 16:41:51 +08:00 |
wangzhenxing
|
1b39fbdbe9
|
【飞升】===========神魂后星级显示修改
|
2022-01-10 15:11:30 +08:00 |
wangzhenxing
|
5b670023ed
|
[飞升]=======飞升代码逻辑提交
|
2022-01-05 18:17:44 +08:00 |
ZhangBiao
|
c0d27feac2
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2022-01-05 10:16:25 +08:00 |
ZhangBiao
|
8de1e4e596
|
【家园】资源提交
|
2021-12-30 19:02:52 +08:00 |
wangzhenxing
|
270e359507
|
[玉虚论道]=====对战界面添加音效
|
2021-12-30 14:41:43 +08:00 |
ZhangBiao
|
d39153607b
|
【灵兽特惠】倒计时修改
|
2021-11-29 13:40:53 +08:00 |
wangzhenxing
|
f10d6ee2a1
|
[玉虚论道]======保存队伍时添加相同英雄检测
|
2021-11-22 10:18:39 +08:00 |
jiaoyangna
|
1b95b2a04a
|
公会查看成员编队神将属性错误修改
|
2021-11-10 13:23:42 +08:00 |
jiaoyangna
|
67c6e7d92d
|
玉虚论道编队修改
|
2021-11-08 11:06:57 +08:00 |
jiaoyangna
|
e8433d1026
|
玉虚论道记录神魂修改提交,神将界面修改提交
|
2021-11-08 10:30:12 +08:00 |
jiaoyangna
|
afcfc1b393
|
神魂星星修改提交
|
2021-11-05 17:38:10 +08:00 |
jiaoyangna
|
d0d93e02ea
|
代码星星层级设置修改
|
2021-11-05 13:18:55 +08:00 |
jiaoyangna
|
2774ca08b1
|
玉虚论道编队报错修改提交
|
2021-11-05 10:42:37 +08:00 |
wangzhenxing
|
c04ee81117
|
【玉虚论道】======战斗信息界面报错修改提交
|
2021-11-05 10:17:45 +08:00 |
jiaoyangna
|
154aa77cd3
|
神魂特效修改提交
|
2021-11-04 10:46:25 +08:00 |
jiaoyangna
|
596c8477d3
|
Merge branch 'china/dev' into 0功能/神魂
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
|
2021-11-04 09:29:56 +08:00 |
wangzhenxing
|
bc37810f8b
|
【玉虚论道】=====修改对战完 点击确定主城列表不刷新问题
|
2021-11-02 14:43:47 +08:00 |
wangzhenxing
|
9fd4d332bd
|
[玉虚论道]==============点击刷新敌方列表 偶先提示赛季结束修改
|
2021-11-02 10:52:48 +08:00 |
wangzhenxing
|
e1e2f1f663
|
[玉虚论道]=======结算期战斗添加屏蔽
|
2021-11-01 10:53:11 +08:00 |
jiaoyangna
|
d398c21668
|
神魂提交
|
2021-10-27 12:50:15 +08:00 |
jiaoyangna
|
edcdd0e81e
|
Merge branch 'china/dev' into 0功能/神魂
|
2021-10-26 16:01:24 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
wangzhenxing
|
fbf66138ca
|
[玉虚论道]======玉虚段位奖励界面特效层级修改提交
|
2021-10-25 17:19:01 +08:00 |
wangzhenxing
|
b7a2cee564
|
玉虚战斗记录敌方分数显示修改
|
2021-10-22 18:37:42 +08:00 |