wangzhenxing
|
0681ff2a30
|
[战斗]=========战斗去除无用log
|
2023-04-07 11:33:50 +08:00 |
yuanshuai
|
0b3e5511b2
|
神兵帮助
|
2023-04-07 11:13:15 +08:00 |
yuanshuai
|
fc26bf5c5d
|
神兵bug修改
|
2023-04-07 10:46:39 +08:00 |
yuanshuai
|
fc218b4002
|
神兵回炉代码提交
|
2023-04-07 10:29:10 +08:00 |
lihaiyang
|
d8a97002d5
|
神兵强化石 和货币上传
|
2023-04-07 10:21:41 +08:00 |
yuanshuai
|
a7ccff7ff1
|
神兵功能优化
|
2023-04-06 18:13:54 +08:00 |
wangzhenxing
|
01430e7126
|
Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
|
2023-04-06 17:22:06 +08:00 |
wangzhenxing
|
b3071916c1
|
【战斗】===========神兵战斗提交
|
2023-04-06 17:21:35 +08:00 |
yuanshuai
|
c8184bbca4
|
神兵功能优化
|
2023-04-06 15:28:55 +08:00 |
wangzhenxing
|
ab3484709d
|
[战斗]=========添加神兵目标选择
|
2023-04-06 14:22:20 +08:00 |
wangzhenxing
|
cbd60b5e14
|
[战斗]==================战斗添加神兵
|
2023-04-06 14:02:32 +08:00 |
wangzhenxing
|
17f09032eb
|
Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
|
2023-04-06 13:47:59 +08:00 |
yuanshuai
|
8af6417b72
|
神兵bug修改
|
2023-04-06 13:40:13 +08:00 |
lihaiyang
|
d6c082583a
|
商店图标
|
2023-04-04 18:42:30 +08:00 |
yuanshuai
|
31f51cca80
|
神兵红点提交
|
2023-04-04 18:21:14 +08:00 |
lihaiyang
|
c3bac10fc9
|
添加神兵技能图片
|
2023-04-04 18:02:54 +08:00 |
wangzhenxing
|
e4de1d7188
|
Merge branch 'china/dev_bt' into china/dev_bt_develop
|
2023-04-04 16:55:09 +08:00 |
wangzhenxing
|
d3c0c9671b
|
battlemanager 提交
|
2023-04-04 16:49:58 +08:00 |
wangzhenxing
|
478347bc6d
|
战斗============================被动441修改
|
2023-04-04 16:27:15 +08:00 |
yuanshuai
|
6f5528173c
|
添加技能图标
|
2023-04-04 15:38:45 +08:00 |
yuanshuai
|
22ebe21c0a
|
预设提交
|
2023-04-04 14:59:06 +08:00 |
yuanshuai
|
047274e736
|
Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
|
2023-04-04 14:55:05 +08:00 |
yuanshuai
|
be268b9662
|
神兵升星强化优化
|
2023-04-04 14:54:14 +08:00 |
lihaiyang
|
f6ed14e951
|
神兵修为布局
|
2023-04-04 14:49:53 +08:00 |
yuanshuai
|
3d5e8c8c5b
|
战力相关提交
|
2023-04-04 11:59:36 +08:00 |
wangzhenxing
|
12e2cecaa1
|
神兵属性,神兵羁绊,神兵分解提交
|
2023-04-04 11:15:32 +08:00 |
yuanshuai
|
feaeb268f5
|
神兵详情界面修改
|
2023-04-03 11:18:04 +08:00 |
yuanshuai
|
6c5acdab26
|
神兵更换代码提交
|
2023-03-31 18:20:38 +08:00 |
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
|
8eb24fd591
|
公共协议修改提交
|
2023-03-29 15:30:25 +08:00 |
wangzhenxing
|
a2b791c0de
|
战斗协议修改提交
|
2023-03-29 13:10:25 +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 |
wangzhenxing
|
8a4a28a635
|
聊天去掉gm礼包限制
|
2023-03-28 10:25:45 +08:00 |
lihaiyang
|
8a737a3337
|
神兵图标
|
2023-03-24 17:52:32 +08:00 |
lihaiyang
|
7d20a309a4
|
添加压制方面的图标
|
2023-03-24 11:15:36 +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 |
wangzhenxing
|
b1e56c1280
|
获取宝物法相展示修改提交
|
2023-02-21 15:25:14 +08:00 |
yuanshuai
|
7bb73f1175
|
神将置换卡bug修改
|
2023-02-21 14:24:00 +08:00 |
wangzhenxing
|
2985c1f5a2
|
法相装备修改提交
|
2023-02-21 14:20:46 +08:00 |
wangzhenxing
|
46ddd9696a
|
itemview 去除法相点击事件
|
2023-02-21 11:48:11 +08:00 |
yuanshuai
|
4963f1abaf
|
神将置换卡bug修改
|
2023-02-21 11:26:45 +08:00 |
wangzhenxing
|
34077030ca
|
法相红点修改提交
|
2023-02-20 22:24:28 +08:00 |
wangzhenxing
|
6b718c2217
|
去除属性log
|
2023-02-20 21:07:24 +08:00 |
wangzhenxing
|
ff6f452f32
|
法相属性显示修改
|
2023-02-20 18:49:34 +08:00 |
wangzhenxing
|
7f20d17b42
|
法相背包显示修改
|
2023-02-20 17:58:28 +08:00 |
wangzhenxing
|
0b88a77535
|
法相修改提交
|
2023-02-20 17:38:59 +08:00 |
yuanshuai
|
6ab148bdeb
|
灵脉bug修改
|
2023-02-20 16:57:18 +08:00 |
wangzhenxing
|
91b13fb22c
|
法相显示修改提交
|
2023-02-20 16:20:17 +08:00 |
yuanshuai
|
0d44032d25
|
灵脉修改
|
2023-02-20 15:06:47 +08:00 |
wangzhenxing
|
db4d23bdfa
|
Merge branch 'china/dev_bt_develop_faxiang' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop_faxiang
|
2023-02-20 14:46:58 +08:00 |
wangzhenxing
|
76c81f44d4
|
法相增加属性计算修改
|
2023-02-20 14:46:37 +08:00 |
yuanshuai
|
250078eb33
|
一键装备法相bug修改
|
2023-02-20 14:25:44 +08:00 |
yuanshuai
|
cd719257fd
|
装备栏预设修改
|
2023-02-20 11:57:29 +08:00 |
wangzhenxing
|
8195d63809
|
Merge branch 'china/dev_bt_develop_faxiang' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop_faxiang
|
2023-02-20 11:44:40 +08:00 |
wangzhenxing
|
2218dd8f6e
|
法相属性刷新
|
2023-02-20 11:44:20 +08:00 |
yuanshuai
|
3687ad47cc
|
法相显示修改
|
2023-02-20 11:23:50 +08:00 |
yuanshuai
|
9fecd102e9
|
法相背包显示修改
|
2023-02-20 10:59:12 +08:00 |
wangzhenxing
|
726b53355e
|
法相背包修改提交
|
2023-02-19 21:21:45 +08:00 |
wangzhenxing
|
d84f374bf2
|
法相修改提交
|
2023-02-19 20:08:48 +08:00 |
wangzhenxing
|
1f83739af1
|
法相升级升星提交
|
2023-02-18 22:21:24 +08:00 |
wangzhenxing
|
8cb653fcb4
|
Merge branch 'china/dev_bt_develop_faxiang' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop_faxiang
|
2023-02-18 15:57:37 +08:00 |
wangzhenxing
|
dd7394cc29
|
法相manager修改提交
|
2023-02-18 15:57:20 +08:00 |
yuanshuai
|
c2f2f9255b
|
法相修改提交
|
2023-02-18 15:52:52 +08:00 |
wangzhenxing
|
7276228e94
|
法相manager提交
|
2023-02-18 15:41:04 +08:00 |
wangzhenxing
|
68893390bf
|
背包预设修改提交
|
2023-02-18 14:09:32 +08:00 |
wangzhenxing
|
da9c6d43f4
|
装备界面修改
|
2023-02-18 14:03:52 +08:00 |
yuanshuai
|
98ddf9b5c2
|
法相相关脚本预设提交
|
2023-02-18 13:31:36 +08:00 |
wangzhenxing
|
0b6d8ab978
|
法相提交
|
2023-02-17 19:43:00 +08:00 |
lihaiyang
|
123ac3f9fe
|
身外化神界面 箭头拉大
|
2023-02-17 17:11:06 +08:00 |
wangzhenxing
|
870d163b8c
|
身外化身界面适配修改提交
|
2023-02-17 16:54:22 +08:00 |
lihaiyang
|
b6be5e9106
|
置换卡图片
|
2023-02-17 14:41:21 +08:00 |
lihaiyang
|
4c0a6c1b1b
|
金刚印相关
|
2023-02-17 14:10:07 +08:00 |
yuanshuai
|
c5d6479e9c
|
预设修改
|
2023-02-17 10:28:00 +08:00 |
wangzhenxing
|
895b577935
|
Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/ConfigData.lua
|
2023-02-16 18:37:01 +08:00 |
wangzhenxing
|
a713a185cf
|
法相常量提交
|
2023-02-16 18:34:04 +08:00 |
yuanshuai
|
d13e485b05
|
神将置换功能提交
|
2023-02-16 18:11:55 +08:00 |
wangzhenxing
|
27b390e8c2
|
Revert "法相协议提交"
This reverts commit cd865d4df5.
|
2023-02-16 17:53:13 +08:00 |
wangzhenxing
|
d902496f69
|
Merge branch 'china/dev_bt' into china/dev_bt_develop
|
2023-02-16 17:48:43 +08:00 |
wangzhenxing
|
cd865d4df5
|
法相协议提交
|
2023-02-16 17:03:02 +08:00 |
lihaiyang
|
f2df1887b8
|
Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
|
2023-02-16 14:34:25 +08:00 |
lihaiyang
|
e6b6985ff0
|
法相宝箱
|
2023-02-16 14:33:34 +08:00 |
wangzhenxing
|
de59133024
|
【战斗】===========添加 buff金刚印记
|
2023-02-15 18:48:53 +08:00 |
yuanshuai
|
31fe9d43f0
|
灵脉修改
|
2023-02-15 15:33:16 +08:00 |
yuanshuai
|
c10503dff3
|
灵脉预设修改
|
2023-02-15 15:31:46 +08:00 |
wangzhenxing
|
eb010bb2a9
|
【战斗】=====================被动448修改, 死亡不释放技能修改
|
2023-02-15 14:18:54 +08:00 |
wangzhenxing
|
d724309a7d
|
魂印图鉴去掉天书密卷限制
|
2023-02-14 18:13:22 +08:00 |
wangzhenxing
|
fe7af8dc80
|
Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
|
2023-02-14 18:06:43 +08:00 |
wangzhenxing
|
d6baa6f578
|
魂印图鉴去掉天书密卷限制
|
2023-02-14 18:05:59 +08:00 |
yuanshuai
|
48b5d195ce
|
灵脉修改提交
|
2023-02-14 18:03:36 +08:00 |
yuanshuai
|
4ec80f9aad
|
Merge branch 'china/dev_bt_develop' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt_develop
|
2023-02-14 16:22:13 +08:00 |
yuanshuai
|
33effd862a
|
灵脉修改
|
2023-02-14 16:21:41 +08:00 |
wangzhenxing
|
0a2f07e93d
|
合并dev_bt分支
|
2023-02-14 16:19:23 +08:00 |
wangzhenxing
|
41259cc2f4
|
[战斗]=======添加被动454
|
2023-02-14 16:05:08 +08:00 |
wangzhenxing
|
549e36ed7c
|
[战斗]===========法相被动修改提交
|
2023-02-14 15:10:01 +08:00 |
wangzhenxing
|
5127ef5d90
|
[战斗]===================法相被动提交
|
2023-02-14 15:08:51 +08:00 |
lihaiyang
|
c2158cffde
|
法相强化石
|
2023-02-14 14:51:40 +08:00 |
wangzhenxing
|
84a9fd51f6
|
心魔挑战开启快速挑战
|
2023-02-13 18:33:35 +08:00 |
wangzhenxing
|
63a652ae54
|
[战斗]===========法相被动修改提交
|
2023-02-13 18:32:31 +08:00 |
wangzhenxing
|
754c01c918
|
心魔挑战开启快速挑战
|
2023-02-13 17:49:11 +08:00 |
lihaiyang
|
2981a65bbf
|
称号=====永结同心
|
2023-02-13 17:10:00 +08:00 |
wangzhenxing
|
5a82a6471c
|
[战斗]===================法相被动提交
|
2023-02-13 17:08:29 +08:00 |
lihaiyang
|
0b4b59e542
|
称号=====永结同心
|
2023-02-13 16:40:15 +08:00 |
wangzhenxing
|
c894b57bb7
|
登陆第一个请求添加日志
|
2023-02-13 14:54:48 +08:00 |
wangzhenxing
|
04ea826ab8
|
白金魂宝神应修改提交
|
2023-02-13 14:05:12 +08:00 |