yuanshuai
|
a176bca619
|
神兵相关修改提交
|
2023-03-31 17:52:12 +08:00 |
yuanshuai
|
bda6306f3d
|
神兵升级升星相关功能提交
|
2023-03-30 16:27:13 +08:00 |
yuanshuai
|
782c351cec
|
Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
# Conflicts:
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Modules/GodWeapon/GodWeaponManager.lua
|
2023-03-30 13:27:35 +08:00 |
yuanshuai
|
6c215136f2
|
神兵相关功能提交
|
2023-03-30 13:16:11 +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 |
wangzhenxing
|
24ad78e8da
|
神兵主界面修改提交
|
2023-03-28 17:51:43 +08:00 |
wangzhenxing
|
826f58ce6e
|
神兵提交
|
2023-03-28 13:57:59 +08:00 |
lihaiyang
|
8a737a3337
|
神兵图标
|
2023-03-24 17:52:32 +08:00 |
wangzhenxing
|
c370823e04
|
神兵常量提交
|
2023-03-24 11:08:03 +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
|
e45c2bcae1
|
Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
|
2023-03-21 16:13:38 +08:00 |
wangzhenxing
|
4848d707ff
|
多队塔修改提交
|
2023-03-21 16:12:57 +08:00 |
lihaiyang
|
0eaa10d4d3
|
多队塔界面修改
|
2023-03-21 16:02:24 +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
|
c5c237493b
|
登陆界面幼儿协议,分享协议修改提交
|
2023-03-21 10:16:56 +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
|
cea97b3605
|
Merge branch 'china/dev_bt' into china/dev_bt_develop
Conflicts:
Assets/ManagedResources/Atlas/CarbonNewAtlas/ArtFont/f_fuben_fubenming_08.png.meta
|
2023-03-20 11:39:20 +08:00 |
wangzhenxing
|
d1e4786ef7
|
副本入口文字提交
|
2023-03-20 11:36:38 +08:00 |
wangzhenxing
|
4a411833a5
|
多队塔提交
|
2023-03-20 11:22:44 +08:00 |
wangzhenxing
|
3a5076bb2e
|
法相佩戴条件修改
|
2023-03-10 16:55:37 +08:00 |
wangzhenxing
|
4ad0ba6bf6
|
Merge branch 'china/dev_bt' into china/dev_bt_develop
|
2023-03-10 13:33:07 +08:00 |
wangzhenxing
|
5aeffabd6f
|
助战法相信息显示修改
|
2023-03-10 13:29:22 +08:00 |
wangzhenxing
|
f8d5e6fcff
|
多队塔图片提交
|
2023-03-07 14:21:50 +08:00 |
lihaiyang
|
bf13859e52
|
添加压制方面的图标
|
2023-03-03 15:18:03 +08:00 |
wangzhenxing
|
b094de690f
|
技能描述显示修改
|
2023-03-03 13:22:44 +08:00 |
wangzhenxing
|
f2b6ff1412
|
[战斗]=============被动441 455修改
|
2023-03-02 17:54:57 +08:00 |
wangzhenxing
|
47074a40d0
|
[战斗]=========新英雄技能被动提交
|
2023-03-01 17:24:25 +08:00 |
lihaiyang
|
480e7b1cbe
|
添加女娲图片
|
2023-03-01 11:28:06 +08:00 |
lihaiyang
|
330fe63d9f
|
女娲相关
|
2023-02-28 18:14:52 +08:00 |
lihaiyang
|
69d1882c7d
|
新增新将技能图标
|
2023-02-28 15:55:01 +08:00 |
yuanshuai
|
a9a4d13fdf
|
删除log
|
2023-02-28 15:09:15 +08:00 |
yuanshuai
|
cbfd2bd8ca
|
图鉴技能打印
|
2023-02-28 14:39:24 +08:00 |
wangzhenxing
|
0708630890
|
新英雄 ===================雨女资源提交
|
2023-02-28 10:59:28 +08:00 |
wangzhenxing
|
1d36c0b7f4
|
Merge branch 'china/dev_bt' into china/dev_bt_develop
|
2023-02-28 10:25:57 +08:00 |
wangzhenxing
|
bee3a99dbc
|
变身卡左移按钮显示修改提交
|
2023-02-24 15:26:41 +08:00 |
wangzhenxing
|
08145e72d9
|
[战斗]=======================每回合添加最大buff添加数,伤害数,治疗御甲数限制
|
2023-02-24 15:19:33 +08:00 |
wangzhenxing
|
1c60b69d1a
|
[战斗]=======================每回合添加最大buff添加数,伤害数,治疗御甲数限制
|
2023-02-24 11:02:14 +08:00 |
lihaiyang
|
171fbe8d90
|
雨女法宝图片
|
2023-02-23 18:46:00 +08:00 |
wangzhenxing
|
438e09fdcd
|
Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
|
2023-02-23 15:33:07 +08:00 |
yuanshuai
|
b2438ab501
|
升星冲榜添加我的排名
|
2023-02-22 18:31:53 +08:00 |
wangzhenxing
|
6fe2c64214
|
获得宝箱修改提交
|
2023-02-22 10:45:17 +08:00 |
wangzhenxing
|
887a8b471f
|
法相升级预设修改提交
|
2023-02-21 16:39:28 +08:00 |