jiaoyangna
|
2a8b4bca8c
|
【ID1010994】
增加单笔充值活动
|
2022-01-05 18:17:36 +08:00 |
jiaoyangna
|
bc582b85e2
|
层级修改提交
|
2022-01-04 15:54:23 +08:00 |
jiaoyangna
|
5e28b8ad36
|
添加容错
|
2021-12-31 18:05:55 +08:00 |
jiaoyangna
|
fee12d7063
|
顶着复活中跑
|
2021-12-31 17:36:11 +08:00 |
jiaoyangna
|
330c34a0b8
|
探索地图人物切换修改
|
2021-12-31 16:32:08 +08:00 |
jiaoyangna
|
17c6d0cdc7
|
地图小人挺住不动修改
|
2021-12-31 14:07:56 +08:00 |
ZhangBiao
|
cf9cbc5ac9
|
【家园】摘星阁装备属性加持+战斗力
|
2021-12-31 13:44:11 +08:00 |
jiaoyangna
|
12049b61f8
|
探索地图报错修改
|
2021-12-31 12:23:46 +08:00 |
ZhangBiao
|
8de1e4e596
|
【家园】资源提交
|
2021-12-30 19:02:52 +08:00 |
jiaoyangna
|
af30beccd3
|
资源条跳转错误修改提交
|
2021-12-30 18:12:56 +08:00 |
jiaoyangna
|
eee9a714f3
|
修行名字颜色修改提交
|
2021-12-30 15:22:06 +08:00 |
jiaoyangna
|
b118d30185
|
添加修行等级
|
2021-12-30 14:38:06 +08:00 |
jiaoyangna
|
d4d1653bc2
|
探索优化
|
2021-12-30 14:01:30 +08:00 |
jiaoyangna
|
80263f61f0
|
探索优化提交
|
2021-12-30 13:50:39 +08:00 |
jiaoyangna
|
7b67ef38df
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-12-30 11:43:22 +08:00 |
jiaoyangna
|
a7fde7ccf2
|
报错修改提交
|
2021-12-30 10:14:01 +08:00 |
jiaoyangna
|
d17a9aa29d
|
死亡之后站立不动
|
2021-12-30 10:07:02 +08:00 |
jiaoyangna
|
657574b61a
|
探索地图修改提交
|
2021-12-29 16:21:59 +08:00 |
jiaoyangna
|
89c298f593
|
探索地图修改提交
|
2021-12-29 16:05:16 +08:00 |
gaoxin
|
b6a00666ae
|
【动画】循环列表动画修改为平移动画,拖动时不再播放动画
|
2021-12-30 22:09:34 +08:00 |
jiaoyangna
|
978689d9a7
|
探索提交
|
2021-12-28 17:52:28 +08:00 |
jiaoyangna
|
9dafa85858
|
探索提交
|
2021-12-28 13:30:27 +08:00 |
jiaoyangna
|
d83373ecab
|
Merge branch 'china/dev' into tansuo
# Conflicts:
# Assets/ManagedResources/Prefabs/Map/SingleExplorePlayerView.prefab
# Assets/ManagedResources/Prefabs/UI/ContinuePackage/PremiumRebatePanel.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Logic/GameEvent.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua
# Assets/ManagedResources/~Lua/Modules/Fight/View/ExploreMapView.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/JumpViewNew.lua
# Assets/ManagedResources/~Lua/View/SingleExplorePlayerView.lua
|
2021-12-27 17:00:14 +08:00 |
jiaoyangna
|
9e47928008
|
探索提交
|
2021-12-27 16:16:56 +08:00 |
jiaoyangna
|
09a810af3f
|
玉帝跳转提交
|
2021-12-24 14:52:05 +08:00 |
jiaoyangna
|
36ec134505
|
玉帝获取途径跳转提交
|
2021-12-24 14:20:06 +08:00 |
jiaoyangna
|
21e5b0846b
|
玉帝跳转提交
|
2021-12-24 14:13:39 +08:00 |
jiaoyangna
|
88130ac4dd
|
探索提交
|
2021-12-24 14:09:48 +08:00 |
jiaoyangna
|
e34092f93d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-12-24 10:54:16 +08:00 |
jiaoyangna
|
5d37c0d4d9
|
探索提交
|
2021-12-23 17:23:02 +08:00 |
ZhangBiao
|
926e0a4fbd
|
【命石】一键合成修改
|
2021-12-23 16:17:35 +08:00 |
jiaoyangna
|
83b5a04ac6
|
探索提交
|
2021-12-23 13:45:33 +08:00 |
jiaoyangna
|
39254af42e
|
探索提交
|
2021-12-23 13:45:05 +08:00 |
ZhangBiao
|
e6aa1d31fe
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Practice/PracticePanel.prefab
# Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua
# Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
|
2021-12-23 09:43:06 +08:00 |
ZhangBiao
|
4b27fa6a1b
|
【副本】灰色红点提交
|
2021-12-20 15:45:06 +08:00 |
ZhangBiao
|
a197f16837
|
Merge branch 'china/dev' into 0功能/命格
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-12-17 15:46:53 +08:00 |
ZhangBiao
|
d939e6b32b
|
【新人商城】提交
|
2021-12-17 14:00:07 +08:00 |
gaoxin
|
acf5e8e31a
|
【挂机物品】导致其他物品显示错误
|
2021-12-26 17:29:06 +08:00 |
gaoxin
|
cb8f8fe0aa
|
【挂机物品】添加时间标签
|
2021-12-26 17:13:30 +08:00 |
ZhangBiao
|
ad589aa449
|
【命格】提交
|
2021-12-10 17:18:18 +08:00 |
ZhangBiao
|
ae3a2fa3e4
|
【命格】提交
|
2021-12-08 15:40:43 +08:00 |
ZhangBiao
|
fe99e89eb9
|
【连购礼包】顶呱深处跳转修改
|
2021-12-06 19:11:45 +08:00 |
ZhangBiao
|
9db47caa8e
|
【连购礼包】跳转修改
|
2021-12-06 18:59:57 +08:00 |
jiaoyangna
|
77949c23e6
|
商店背景蒙黑处理
|
2021-12-06 17:56:47 +08:00 |
jiaoyangna
|
9ae56712c4
|
添加已获得标志
|
2021-12-06 16:04:01 +08:00 |
jiaoyangna
|
709f125845
|
商店修改
|
2021-12-06 15:43:05 +08:00 |
jiaoyangna
|
0ca366cdf4
|
添加加号提交
|
2021-12-06 11:11:16 +08:00 |
jiaoyangna
|
6309159f77
|
方寸寻宝修改提交
|
2021-12-06 09:58:04 +08:00 |
jiaoyangna
|
1253466912
|
天地烘炉提交
|
2021-12-02 15:18:56 +08:00 |
ZhangBiao
|
14b6087d77
|
【神将来源】获取途径报错修改
|
2021-11-27 17:21:24 +08:00 |
jiaoyangna
|
0c6ff17ddd
|
修改提交
|
2021-11-27 14:30:51 +08:00 |
wangzhenxing
|
3c22a1ef6c
|
[立绘朝向]======静态立绘朝向改回原样
|
2021-11-27 13:17:36 +08:00 |
jiaoyangna
|
f6c94a3cfe
|
变身卡详情提交
|
2021-11-26 19:36:20 +08:00 |
wangzhenxing
|
587a5cfc2e
|
[战斗]=======133 136 137效果修改
|
2021-11-26 18:05:16 +08:00 |
jiaoyangna
|
5542212cc1
|
天地烘炉提交
|
2021-11-26 17:04:54 +08:00 |
gaoxin
|
290911903c
|
【法宝聚灵】修复开启宝箱获取时不显示数字
|
2021-11-22 13:37:12 +08:00 |
ZhangBiao
|
aa52131d3f
|
【灵脉秘境】文字遮挡、跳转
|
2021-11-22 13:27:54 +08:00 |
gaoxin
|
b10dad4285
|
【法宝聚灵】背包和掉落界面不显示碎片框
|
2021-11-22 12:01:16 +08:00 |
jiaoyangna
|
04ff9d99e4
|
碎片自选箱修改提交
|
2021-11-22 11:16:18 +08:00 |
jiaoyangna
|
1b11728534
|
道具点击报错修改提交
|
2021-11-19 18:39:04 +08:00 |
jiaoyangna
|
bc62311af9
|
法宝之魂第二个界面提交
|
2021-11-19 16:52:15 +08:00 |
jiaoyangna
|
2911c5b77c
|
乾坤宝囊限时商店修改提交
(cherry picked from commit e8df9ca87e)
|
2021-11-17 10:36:57 +08:00 |
ZhangBiao
|
79f6f739ad
|
【天枢密卷】魂印文字过长修改
|
2021-11-09 14:44:39 +08:00 |
ZhangBiao
|
ed02f4a86f
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-09 10:22:33 +08:00 |
ZhangBiao
|
12e46be512
|
【装备界面】提交
|
2021-11-09 10:22:16 +08:00 |
jiaoyangna
|
173221dd1a
|
【ID1010656】
【商店优化】魂印商店中,玩家尚未获得过的魂印上添加“新”标志
|
2021-11-08 17:22:51 +08:00 |
jiaoyangna
|
afcfc1b393
|
神魂星星修改提交
|
2021-11-05 17:38:10 +08:00 |
jiaoyangna
|
2aea503619
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-05 17:14:08 +08:00 |
jiaoyangna
|
bd8cd97bf3
|
神魂星星修改提交
|
2021-11-05 17:13:49 +08:00 |
ZhangBiao
|
142956ca6a
|
【活动】活动修改提交
|
2021-11-05 16:43:09 +08:00 |
jiaoyangna
|
9d1e517743
|
四灵试炼层级报错修改
|
2021-11-05 13:53:56 +08:00 |
jiaoyangna
|
d0d93e02ea
|
代码星星层级设置修改
|
2021-11-05 13:18:55 +08:00 |
gaoxin
|
2f65f4d391
|
【心魔试炼】界面报错修复
|
2021-11-05 11:06:10 +08:00 |
jiaoyangna
|
0d68d9229b
|
神魂提交
|
2021-11-05 10:18:10 +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 |
jiaoyangna
|
34d8cf4440
|
神魂位置提交
|
2021-11-04 09:27:56 +08:00 |
jiaoyangna
|
125e37fe6d
|
神魂提交
|
2021-11-03 10:13:44 +08:00 |
ZhangBiao
|
1e203c822c
|
【界面优化】好感度,天枢密卷
|
2021-11-02 13:41:27 +08:00 |
gaoxin
|
5044a79789
|
Revert "Revert "【界面优化】心魔试炼、战斗统计、法宝进阶""
This reverts commit 2901a60489.
|
2021-11-01 18:59:11 +08:00 |
zhangshanxue
|
2901a60489
|
Revert "【界面优化】心魔试炼、战斗统计、法宝进阶"
This reverts commit 75827dc392.
|
2021-11-01 18:53:54 +08:00 |
gaoxin
|
c62c0bc549
|
【坐骑】修复人物变高的问题
|
2021-11-01 16:42:46 +08:00 |
gaoxin
|
10bfe9a7b7
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-01 16:27:12 +08:00 |
gaoxin
|
1b0613673c
|
【坐骑】添加各个方向的偏移配置
|
2021-11-01 16:27:03 +08:00 |
ZhangBiao
|
cdc5b5854b
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-11-01 16:20:40 +08:00 |
gaoxin
|
44cb4eb282
|
【坐骑】坐骑和人物层级改为表配置
|
2021-11-01 15:53:33 +08:00 |
ZhangBiao
|
75827dc392
|
【界面优化】心魔试炼、战斗统计、法宝进阶
|
2021-11-01 15:36:40 +08:00 |
jiaoyangna
|
766710dc6b
|
Merge branch 'china/dev' into 0功能/神魂
|
2021-10-29 13:25:35 +08:00 |
jiaoyangna
|
5abf6060d2
|
魂印商店刷新修改
|
2021-10-28 18:06:26 +08:00 |
jiaoyangna
|
feb859b9a6
|
魂印商店刷新修改
|
2021-10-28 18:01:48 +08:00 |
jiaoyangna
|
acf33d10a3
|
【ID1018914】
【心魔试炼】通过最高层后,点击快速挑战报服务器开小差错误提示
|
2021-10-28 17:59:56 +08:00 |
jiaoyangna
|
413d98fe82
|
【ID1010609】
【商店优化】魂印商店出现红色魂印时,点击刷新增加二次确认
|
2021-10-28 17:28:12 +08:00 |
jiaoyangna
|
d398c21668
|
神魂提交
|
2021-10-27 12:50:15 +08:00 |
jiaoyangna
|
5e8ad7dd08
|
神魂提交
|
2021-10-26 16:00:31 +08:00 |
ZhangBiao
|
615fa3f7d7
|
【寻宝迷踪】去除log
|
2021-10-18 18:18:04 +08:00 |
ZhangBiao
|
bc7e316531
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-10-18 16:19:19 +08:00 |
ZhangBiao
|
1c137cc911
|
【寻宝迷踪】骑着坐骑寻宝,特效显示分割线,需要修改
|
2021-10-18 16:18:59 +08:00 |
jiaoyangna
|
2ed7770259
|
排行榜上小人方向修改
(cherry picked from commit 35e0b7e419)
|
2021-10-15 12:13:37 +08:00 |
jiaoyangna
|
3e616a0462
|
排行榜上小人方向修改
(cherry picked from commit f31f62ec09)
|
2021-10-15 12:13:28 +08:00 |
jiaoyangna
|
35e0b7e419
|
排行榜上小人方向修改
|
2021-10-15 11:53:16 +08:00 |
jiaoyangna
|
f31f62ec09
|
排行榜上小人方向修改
|
2021-10-15 11:51:38 +08:00 |
jiaoyangna
|
450d426232
|
Merge branch 'china/dev' into 0功能/玉虚论道
|
2021-10-15 10:05:22 +08:00 |
jiaoyangna
|
7ac2417ff8
|
【ID1010479】
天书秘卷调整
|
2021-10-15 09:54:12 +08:00 |
jiaoyangna
|
8c95ee03e9
|
【ID1010479】
天书秘卷调整
|
2021-10-14 20:18:02 +08:00 |
jiaoyangna
|
bbd9c9e1c2
|
坐骑方向调整
|
2021-10-14 16:37:09 +08:00 |
jiaoyangna
|
f964d2a10c
|
添加,缩短魂印名字
|
2021-10-14 15:16:14 +08:00 |
jiaoyangna
|
204aba3fde
|
缩短魂印名字
|
2021-10-14 15:14:07 +08:00 |
jiaoyangna
|
4f580146bd
|
【ID1010465】
增加白金装备图鉴
|
2021-10-14 12:01:55 +08:00 |
wangzhenxing
|
2237084155
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-10-12 20:08:46 +08:00 |
wangzhenxing
|
4317d1df54
|
奖励显示修改
|
2021-10-12 10:27:49 +08:00 |
jiaoyangna
|
1269b5b114
|
【ID1010436】
【优化】好感度增加通用礼物 及界面优化
|
2021-10-11 11:31:03 +08:00 |
jiaoyangna
|
7737449829
|
【ID1018681】
【好感度】逍遥游游历成功界面的礼物图标点不开
|
2021-10-09 12:14:34 +08:00 |
jiaoyangna
|
33acb35f82
|
Merge branch 'china/dev' into 0功能/好感度
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
|
2021-09-28 09:52:22 +08:00 |
jiaoyangna
|
c778c334e5
|
添加道具属性显示
|
2021-09-27 16:49:25 +08:00 |
jiaoyangna
|
644d8e3790
|
长按短按效果添加
|
2021-09-27 16:43:01 +08:00 |
wangzhenxing
|
a3e1782007
|
【功能】==========白金装备合成提交
|
2021-09-26 17:30:35 +08:00 |
gaoxin
|
6a71a972e9
|
【战斗力】关闭一些log
|
2021-09-26 11:18:38 +08:00 |
gaoxin
|
8c76d476a2
|
【编队】修复保存编队接口名修改导致的报错
|
2021-09-24 17:49:32 +08:00 |
jiaoyangna
|
2e08cf7672
|
玲珑宝镜消耗道具添加加号
|
2021-09-23 15:50:32 +08:00 |
ZhangBiao
|
fc03b71b84
|
【七界试炼】tijiao
|
2021-09-23 14:21:30 +08:00 |
gaoxin
|
34f3f42a04
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleProInfoPopup.lua
|
2021-09-22 15:36:10 +08:00 |
ZhangBiao
|
cea14746f8
|
【七界试炼】提交
|
2021-09-22 13:33:48 +08:00 |
ZhangBiao
|
1c191a78b9
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
# Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
# Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua
|
2021-09-22 11:46:24 +08:00 |
gaoxin
|
bc659b68f8
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
# Conflicts:
# Assets/Editor/AutoPack.cs
# Assets/Scripts/Editor/ExcelTool/DataConfig/DataConfigWindow.cs
|
2021-09-22 10:54:15 +08:00 |
gaoxin
|
e5af89fac9
|
Merge branch 'china/dev' into 0功能/玉虚论道
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
|
2021-09-22 10:37:42 +08:00 |
wangzhenxing
|
a7f0c42cae
|
Merge branch 'china/dev' into 0功能/玉虚论道
Conflicts:
Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
Assets/ManagedResources/~Lua/Data/UIData.lua
Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
Assets/ManagedResources/~Lua/Modules/Formation/FormationManager.lua
Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua
Assets/ManagedResources/~Lua/Modules/Formation/View/XuanYuanMirrorFormation.lua
Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
Assets/ManagedResources/~Lua/View/UpView.lua
|
2021-09-18 11:52:01 +08:00 |
ZhangBiao
|
a15bd40b96
|
【寻宝迷踪】跳转惊喜礼盒
|
2021-09-18 11:33:46 +08:00 |
gaoxin
|
2494b16f89
|
Merge branch 'china/dev' into 0功能/角色战斗力计算2
|
2021-09-16 13:37:16 +08:00 |
gaoxin
|
66efc9d4e3
|
【战斗力】新战斗力计算系统完成
|
2021-09-16 13:35:33 +08:00 |
ZhangBiao
|
d49d73dcb5
|
【寻宝迷踪】跳转提交
|
2021-09-15 19:14:18 +08:00 |
gaoxin
|
7462f02cfd
|
Revert Revert 回滚错误的合并 4f19f12612
|
2021-09-15 14:29:14 +08:00 |
ZhangBiao
|
b609616b6b
|
【七界试炼】提交
|
2021-09-13 18:06:39 +08:00 |
ZhangBiao
|
94ed6ad618
|
Merge branch '0功能/玉虚论道' into 0功能/七界试炼
# Conflicts:
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2021-09-13 13:56:43 +08:00 |
wangzhenxing
|
aaa4b987eb
|
玉虚论道修改
|
2021-09-11 19:47:23 +08:00 |
ZhangBiao
|
41282c144c
|
【七界试炼】七界币增加加号
|
2021-09-11 15:47:19 +08:00 |
wangzhenxing
|
e2f7284507
|
qqqq
|
2021-09-10 15:50:24 +08:00 |
gaoxin
|
3e3d0d9416
|
Merge remote-tracking branch 'origin/china/xq' into china/dev
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
# Assets/ManagedResources/~Lua/View/ItemView.lua
|
2021-09-09 11:22:47 +08:00 |
jiaoyangna
|
a012ece114
|
【ID1010233】
【宝物详情优化】在装备界面和情报界面增加宝物共鸣属性显示
|
2021-09-08 10:27:26 +08:00 |
gaoxin
|
17ebbc1872
|
【优化】灵兽商城商品上显示当前已有的灵兽碎片
|
2021-09-06 18:19:45 +08:00 |
jiaoyangna
|
5af2fc261d
|
心魔修改提交
|
2021-09-03 18:56:46 +08:00 |
jiaoyangna
|
17f6cb8ff1
|
报错修改
|
2021-09-03 18:43:03 +08:00 |
jiaoyangna
|
4d5876eb28
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua
|
2021-09-02 19:33:48 +08:00 |
jiaoyangna
|
13909e60aa
|
编队id修改
|
2021-09-02 17:29:44 +08:00 |
jiaoyangna
|
96f2530ae8
|
加号修改
|
2021-09-02 16:20:33 +08:00 |
jiaoyangna
|
37c1c77737
|
添加道具 太初之气 加号
|
2021-09-02 16:17:26 +08:00 |
ZhangBiao
|
6bbf30e344
|
【心魔试炼、幸运探宝】星级特效显示、高级探宝时间显示000000
|
2021-09-02 11:19:29 +08:00 |
jiaoyangna
|
4f266a20b9
|
红点问题修改提交
|
2021-09-01 14:17:21 +08:00 |
jiaoyangna
|
a12c9330c7
|
四灵第二次修改提交
|
2021-09-01 10:08:25 +08:00 |
jiaoyangna
|
56af6f1a11
|
第一次bug修改提交
|
2021-08-31 20:22:59 +08:00 |
jiaoyangna
|
ad9e76bda5
|
四灵试炼修改提交
|
2021-08-31 19:03:29 +08:00 |
jiaoyangna
|
f712786650
|
排行榜宝物数据修改
|
2021-08-31 17:50:58 +08:00 |
jiaoyangna
|
ac22bd000b
|
装备宝物界面修改提交
|
2021-08-31 17:02:22 +08:00 |
jiaoyangna
|
4801852d88
|
神应修改提交
|
2021-08-30 18:09:06 +08:00 |
jiaoyangna
|
1ea100ed83
|
神将情报界面装备宝物修改提交
|
2021-08-30 16:44:26 +08:00 |
jiaoyangna
|
a76f27ecf0
|
四灵提交
|
2021-08-30 14:21:41 +08:00 |
jiaoyangna
|
2fbe372c76
|
四灵修改提交
|
2021-08-27 18:39:45 +08:00 |
jiaoyangna
|
ab1a4ea627
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-26 17:42:25 +08:00 |
jiaoyangna
|
cd594275e0
|
四灵试炼修改提交
|
2021-08-26 17:25:02 +08:00 |
gaoxin
|
c325bf563f
|
Revert 回滚错误的合并 4f19f12612
|
2021-08-26 16:43:27 +08:00 |
gaoxin
|
eebd99883b
|
【优化】添加判断物体是否被销毁的方法,优化可能导致黑屏卡死的问题
|
2021-08-25 20:59:26 +08:00 |
jiaoyangna
|
0c7e38a715
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
|
2021-08-25 15:25:54 +08:00 |
ZhangBiao
|
6c2e75b384
|
Merge branch 'china/dev' into 0活动开发聚集地/寻宝迷踪
|
2021-08-20 14:40:19 +08:00 |
jiaoyangna
|
bb8ca3c5ca
|
四元阵跳转修改
|
2021-08-19 16:44:13 +08:00 |
ZhangBiao
|
9971d286ea
|
【寻宝迷踪】人物箭头提交
|
2021-08-16 15:37:01 +08:00 |
ZhangBiao
|
57cdcc0809
|
【寻宝迷踪】增加到达特效
|
2021-08-13 15:34:06 +08:00 |
jiaoyangna
|
76dbc01270
|
Merge branch 'china/dev' into 0功能/silingshilian
|
2021-08-12 15:54:58 +08:00 |
ZhangBiao
|
bbe2bb6d6d
|
【寻宝迷踪】提交
|
2021-08-12 12:00:18 +08:00 |
ZhangBiao
|
13777a78cb
|
【寻宝迷踪】增加主角箭头
|
2021-08-11 19:33:01 +08:00 |
ZhangBiao
|
d017873b79
|
【寻宝迷踪】提交
|
2021-08-10 15:27:32 +08:00 |
jiaoyangna
|
34357fddff
|
滑动条修改提交
|
2021-08-06 15:47:31 +08:00 |
jiaoyangna
|
5cf3388a59
|
滑动 回弹修改提交
|
2021-08-06 11:29:06 +08:00 |
jiaoyangna
|
6b8c2f2f3c
|
Merge branch 'china/dev' into 0功能/silingshilian
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Common/CardRendererRoot.prefab
# Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RewardTalismanSingleShowPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/RoleInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipTreasureChangePopup.prefab
# Assets/ManagedResources/RTexture/CardTexture10.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture11.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture12.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture7.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture8.renderTexture.meta
# Assets/ManagedResources/RTexture/CardTexture9.renderTexture.meta
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Data/UIData.lua
# Assets/ManagedResources/~Lua/Framework/Manager/CardRendererManager.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua
# Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
# Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
# Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampPanel.lua
# Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleFailPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/BattleWinPopup.lua
# Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
|
2021-08-06 11:15:13 +08:00 |
jiaoyangna
|
488b7469f6
|
【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
|
2021-08-04 15:52:30 +08:00 |
jiaoyangna
|
3f9b6be120
|
【ID1009737】
【滑动界面】可上下滑动的界面设定一个滑动上限
|
2021-08-04 15:36:39 +08:00 |
wangzhenxing
|
4358ef97e3
|
[bug]====聊天界面称号特效穿透问题修改
|
2021-08-02 14:27:13 +08:00 |
ZhangBiao
|
e829b33d14
|
【万象商会】白篇处理
|
2021-07-30 16:34:50 +08:00 |
gaoxin
|
5aadeb406b
|
【聊天】聊天框根据内容跳转到不同的频道
|
2021-07-30 14:07:08 +08:00 |
jiaoyangna
|
f4cc4d7df6
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 17:46:11 +08:00 |
jiaoyangna
|
7ee1ef9910
|
Merge branch 'china/dev-c' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/DyAct_Activity5.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new.meta
# Assets/ManagedResources/EffectResUI/ChengHao_new/Animation.meta
# Assets/ManagedResources/EffectResUI/ZhenQiBaoGe/Texture.meta
# Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua
|
2021-07-28 17:45:59 +08:00 |
gaoxin
|
e552db5499
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-28 17:43:04 +08:00 |
gaoxin
|
ef78e0ae21
|
【跨服聊天】添加跨服聊天频道
|
2021-07-28 17:42:58 +08:00 |
jiaoyangna
|
7ac8f03cd3
|
Revert "Revert "宝物培养修改提交""
This reverts commit 4590076eb9.
|
2021-07-28 16:58:52 +08:00 |
wangzhenxing
|
68e3a32140
|
[bug]====称号层级修改
|
2021-07-28 16:41:37 +08:00 |
wangzhenxing
|
ef714577e8
|
[bug]========称号显示修改
|
2021-07-28 16:10:58 +08:00 |
jiaoyangna
|
527295f30c
|
宝物优化
|
2021-07-28 10:51:39 +08:00 |
zhangqiang
|
71f7e8a469
|
Merge branch 'china/dev' into china/jumpserver
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
|
2021-07-27 11:26:30 +08:00 |
ZhangBiao
|
07de90eb45
|
【提交】
|
2021-07-26 15:07:49 +08:00 |
jiaoyangna
|
4590076eb9
|
Revert "宝物培养修改提交"
This reverts commit bcd0651029.
|
2021-07-26 10:00:59 +08:00 |
ZhangBiao
|
7e9fad28b7
|
【万象商会】提交
|
2021-07-24 19:33:56 +08:00 |
ZhangBiao
|
4c73ac0976
|
【万象商会】刷新
|
2021-07-24 18:59:42 +08:00 |
ZhangBiao
|
ccc208b2c4
|
【万象商会】界面关闭
|
2021-07-24 17:02:30 +08:00 |
jiaoyangna
|
fd7d51168d
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2021-07-23 19:12:46 +08:00 |
jiaoyangna
|
bcd0651029
|
宝物培养修改提交
|
2021-07-23 19:12:42 +08:00 |
ZhangBiao
|
38bbb808b4
|
【主题活动】商店
|
2021-07-23 19:05:53 +08:00 |
wangzhenxing
|
20bf67d50e
|
【称号】====称号特效显示修改,称号特效预设修改
|
2021-07-23 18:23:55 +08:00 |
wangzhenxing
|
02cea65055
|
[称号]====跨服称号资源提交
|
2021-07-23 11:20:05 +08:00 |
gaoxin
|
0db39ccbe3
|
Merge branch 'china/ios' into china/dev
# Conflicts:
# Assets/ManagedResources/EffectResUI/Carbons/Texture/Other/CarbonImg_monster 4.png.meta
|
2021-07-22 19:39:14 +08:00 |
ZhangBiao
|
190f3722a8
|
Merge branch 'china/dev' into 0优化/副本界面
|
2021-07-22 14:04:11 +08:00 |
JLIOSM1
|
d680e5a507
|
Merge commit 'fb5b009ec8abd5dbb8dd9658f0e8ded91c409fbb' into china/ios
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelTrialPanel.lua.meta
# Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua.meta
# Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanelNew.lua.meta
# Assets/StreamingAssets/Res/PackConfig.txt
# Assets/StreamingAssets/Res/_ReadMe.md
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png
# Assets/StreamingAssets/Res/dl_ui_effect_bg.png.meta
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png
# Assets/StreamingAssets/Res/dl_ui_effect_mingzi_zh.png.meta
# Assets/StreamingAssets/Res/loading1.png
# Assets/StreamingAssets/Res/loading1.png.meta
# Assets/StreamingAssets/Res/loading2.png
# Assets/StreamingAssets/Res/loading2.png.meta
# Assets/StreamingAssets/Res/loading3.png
# Assets/StreamingAssets/Res/loading3.png.meta
# Assets/StreamingAssets/Res/loading4.png
# Assets/StreamingAssets/Res/loading4.png.meta
# Assets/StreamingAssets/Res/loading5.png
# Assets/StreamingAssets/Res/loading5.png.meta
# Assets/StreamingAssets/Res/loading6.png
# Assets/StreamingAssets/Res/loading6.png.meta
# Assets/StreamingAssets/Res/loading_caohua.png.meta
# Assets/StreamingAssets/Res/loading_xipu.png.meta
# Assets/StreamingAssets/Res/login_caohua.png.meta
# Assets/StreamingAssets/Res/login_video.mp4.meta
# Assets/StreamingAssets/Res/login_xipu.png.meta
|
2021-07-21 17:15:36 +08:00 |
JLIOSM1
|
c2dfe0ee92
|
【IOS提审】链接提审服时,部分按钮跳转到妖晶充值
|
2021-07-21 11:33:09 +08:00 |