wangzhenxing
|
083305249a
|
银条添加加号
|
2023-09-20 19:02:41 +08:00 |
xiejun
|
c47462c5d8
|
Merge branch 'dev_one_discount' of http://192.168.1.21:3000/root/miduo_client into onepiece_demo
# Conflicts:
# AssetBundles/version.txt
# Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
# Assets/ManagedResources/Prefabs/UI/HandBook/HandBookHeroInfoPanel.prefab
# Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
# Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/functions.lua
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua
# Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
# Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelChapterPanel.lua
# Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
# Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua
# Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
# Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
# Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
|
2023-09-20 18:57:44 +08:00 |
xiejun
|
88740201b3
|
排行榜UI
|
2023-09-20 18:00:40 +08:00 |
wangzhenxing
|
ff5bcbced9
|
礼物合成显示秀嘎,添加礼物商店跳转
|
2023-09-20 17:40:33 +08:00 |
wangzhenxing
|
5f6d51786d
|
礼物显示修改
|
2023-09-20 15:41:36 +08:00 |
wangzhenxing
|
14ce1fedbd
|
时空神将推荐阵容显示修改提交
(cherry picked from commit 883f9af02e)
|
2023-09-15 14:18:47 +08:00 |
wangzhenxing
|
883f9af02e
|
时空神将推荐阵容显示修改提交
|
2023-09-14 16:21:33 +08:00 |
wangzhenxing
|
6085b2193a
|
多对塔挑战修改
|
2023-09-06 14:43:33 +08:00 |
wangzhenxing
|
3ac8d1ee2c
|
魂印图鉴修改提交
|
2023-09-01 18:48:59 +08:00 |
wangzhenxing
|
2b93776f7c
|
命格修改提交
|
2023-09-01 17:36:15 +08:00 |
wangzhenxing
|
52393c592c
|
命石提交
|
2023-08-31 15:02:13 +08:00 |
xiejun
|
f1b9b526c1
|
代码修改
|
2023-08-30 20:33:29 +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 |
xiejun
|
4d8b08104c
|
七界资源
|
2023-08-28 18:52:15 +08:00 |
xiejun
|
734cb92be9
|
去掉pating和spriteloader相关的代码
|
2023-08-16 11:55:55 +08:00 |
wangzhenxing
|
201d64e5b3
|
置换玉去除加号
|
2023-08-08 15:45:59 +08:00 |
PC-202302260912\Administrator
|
2cb20e9bba
|
英雄获取途径显示修改
|
2023-07-19 14:35:52 +08:00 |
xiejun
|
fd59086676
|
主界面UI替换
|
2023-06-30 00:13:43 +08:00 |
xiejun
|
b47c16dcb7
|
test
|
2023-06-20 18:01:51 +08:00 |
wangzhenxing
|
a0fa68be2a
|
登陆界面去掉儿童协议,主角信息去掉特权等级按钮
|
2023-05-26 18:43:52 +08:00 |
wangzhenxing
|
3bdc14d9a3
|
法相等级星级显示修改
|
2023-04-19 10:57:48 +08:00 |
wangzhenxing
|
bd567ad367
|
神兵icon显示修改
|
2023-04-13 14:29:49 +08:00 |
wangzhenxing
|
3f8a00cb14
|
[神兵]==================修改提交
|
2023-04-11 14:41:36 +08:00 |
wangzhenxing
|
826f58ce6e
|
神兵提交
|
2023-03-28 13:57:59 +08:00 |
wangzhenxing
|
04a84da290
|
多队塔红点提交
|
2023-03-22 14:58:19 +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
|
5aeffabd6f
|
助战法相信息显示修改
|
2023-03-10 13:29:22 +08:00 |
wangzhenxing
|
46ddd9696a
|
itemview 去除法相点击事件
|
2023-02-21 11:48:11 +08:00 |
wangzhenxing
|
726b53355e
|
法相背包修改提交
|
2023-02-19 21:21:45 +08:00 |
wangzhenxing
|
0b6d8ab978
|
法相提交
|
2023-02-17 19:43:00 +08:00 |
wangzhenxing
|
6a44a24e2b
|
野球拳法跳转修改
|
2023-02-10 17:03:29 +08:00 |
wangzhenxing
|
4a4682981a
|
装备摘星阁处理
|
2023-01-24 19:57:57 +08:00 |
wangzhenxing
|
325da0493a
|
妖晶显示修改
|
2023-01-17 11:37:40 +08:00 |
wangzhenxing
|
396f584fd4
|
自选箱显示修改
|
2023-01-17 11:32:08 +08:00 |
wangzhenxing
|
3a77e7088e
|
角色信息框修改
|
2022-12-26 13:45:47 +08:00 |
wangzhenxing
|
da5316e20b
|
名望特权显示修改
|
2022-12-23 16:19:47 +08:00 |
yuanshuai
|
106c095086
|
宝箱红包类型道具获取概率弹窗
|
2022-12-07 18:26:11 +08:00 |
wangzhenxing
|
aa4353177b
|
[bt=======妖晶跳转修改提交]
|
2022-11-30 14:34:17 +08:00 |
wangzhenxing
|
032ef3d34d
|
[bt]======充值修改
|
2022-11-29 17:42:48 +08:00 |
wangzhenxing
|
bfd7967d52
|
抽卡红点修改
|
2022-11-23 14:33:39 +08:00 |
yuanshuai
|
985391bba4
|
【BT】【神尊特权】缺少仙晶获取途径bug修改
|
2022-11-10 14:00:59 +08:00 |
wangzhenxing
|
eeca517eaf
|
屏蔽普通特权入口
|
2022-11-09 10:24:03 +08:00 |
wangzhenxing
|
0ed8fcf2f4
|
[心魔]======红点优化
|
2022-11-08 15:58:18 +08:00 |
wangzhenxing
|
119c186c34
|
[主城]=======按钮修改提交
|
2022-11-08 14:51:51 +08:00 |
wangzhenxing
|
a0e830b025
|
[bt]======变身卡碎片显示修改
|
2022-10-21 10:25:10 +08:00 |
wangzhenxing
|
f14458efda
|
[天书密卷]=====灵兽篇去掉妖晶显示
|
2022-09-26 10:19:29 +08:00 |
wangzhenxing
|
ce0ae1ce1a
|
[gm]======创角即送
|
2022-09-21 18:34:15 +08:00 |
yuanshuai
|
d42106b07e
|
神尊特权提交
|
2022-09-09 18:09:45 +08:00 |
yuanshuai
|
e3f58fbbec
|
物品神应等级显示
|
2022-09-07 15:25:36 +08:00 |
wangzhenxing
|
60b499f13c
|
[洞府]======资源条显示修改
|
2022-09-05 11:14:13 +08:00 |
wangzhenxing
|
02f455f185
|
御剑行商店修改
|
2022-08-18 16:35:14 +08:00 |
wangzhenxing
|
fe21c9d17d
|
[法宝]=====法宝归元显示数量
|
2022-08-17 17:14:37 +08:00 |
wangzhenxing
|
06ba097de4
|
[背包]=========装备碎片提交
|
2022-08-11 11:19:05 +08:00 |
wangzhenxing
|
c08410abc6
|
商店添加法宝提示
|
2022-08-10 16:28:54 +08:00 |
wangzhenxing
|
5120ccdf8c
|
[法宝背包显示修改]========
|
2022-08-10 13:46:01 +08:00 |
wangzhenxing
|
847a90f43f
|
[物品显示]======法宝显示修改
|
2022-08-08 17:58:24 +08:00 |
wangzhenxing
|
62a0903bc1
|
[资源条]======屏蔽寻宝迷踪加号
|
2022-07-13 19:27:38 +08:00 |
wangzhenxing
|
5d41ecc114
|
【装备】======添加蓝白装备
|
2022-06-14 15:58:18 +08:00 |
wangzhenxing
|
d97c84a543
|
[英雄详情修改i]
|
2022-05-19 20:43:41 +08:00 |
wangzhenxing
|
6606b6bc64
|
56级宝物显示在背包
|
2022-04-28 13:46:14 +08:00 |
yuanshuai
|
080f04ebbe
|
变身卡商店bug修改
|
2022-04-27 14:50:59 +08:00 |
yuanshuai
|
bce1445a77
|
神印商店红点添加
|
2022-04-26 19:08:26 +08:00 |
yuanshuai
|
44804a9a4d
|
漏提交
|
2022-04-26 18:52:19 +08:00 |
wangzhenxing
|
ddd2a0c024
|
Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
|
2022-04-26 18:26:20 +08:00 |
wangzhenxing
|
34685c7cb8
|
bug修改
|
2022-04-26 18:25:57 +08:00 |
yuanshuai
|
311439c885
|
【天宫商店】去掉已获得变身卡的购买限制
|
2022-04-26 17:26:55 +08:00 |
yuanshuai
|
4199ea504a
|
查看其他玩家信息,变身卡信息不对bug
|
2022-04-26 17:20:19 +08:00 |
wangzhenxing
|
e0263ea164
|
添加神印笔跳转
|
2022-04-25 13:43:46 +08:00 |
wangzhenxing
|
3678f78c75
|
神印币添加跳转
|
2022-04-24 21:26:32 +08:00 |
wangzhenxing
|
e0ec7f2dec
|
[bug]====英雄信息修改
|
2022-04-02 17:47:30 +08:00 |
wangzhenxing
|
e8c27a0596
|
【bug】======四灵修改
|
2022-04-01 14:02:07 +08:00 |
wangzhenxing
|
a13dd2939a
|
[功能]================神系英雄添加提叫
|
2022-03-28 18:18:19 +08:00 |
wangzhenxing
|
109648ae93
|
Merge branch 'china/dev' into china/飞升
|
2022-01-19 16:13:20 +08:00 |
ZhangBiao
|
6283677b8f
|
【诸多修改】提交
|
2022-01-18 10:53:25 +08:00 |
wangzhenxing
|
a6e05ae8e8
|
Merge branch 'china/dev' into china/飞升
Conflicts:
Assets/ManagedResources/~Lua/Data/UIData.lua
|
2022-01-18 09:53:04 +08:00 |
wangzhenxing
|
d5fd95373f
|
[抽卡奖池]======抽卡奖池预览修改
|
2022-01-17 15:56:27 +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
|
fa1c832170
|
【坐骑】增加详细信息
|
2022-01-15 13:00:45 +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
|
a16b592892
|
[飞升]=========飞升优化修改
|
2022-01-13 10:01:22 +08:00 |
ZhangBiao
|
48901f3817
|
【寻仙招募】心愿单中添加飞升石道具
|
2022-01-12 18:27:16 +08:00 |
wangzhenxing
|
cd1b81c03e
|
[飞升]======飞升修改提交
|
2022-01-12 17:29:52 +08:00 |
ZhangBiao
|
f131da8558
|
【方寸寻宝】点击自选箱显示详细信息
|
2022-01-12 15:38:31 +08:00 |
wangzhenxing
|
1b39fbdbe9
|
【飞升】===========神魂后星级显示修改
|
2022-01-10 15:11:30 +08:00 |
gaoxin
|
ee60ae6c9a
|
【限时升星】显示优化,红点添加,条件屏蔽添加
|
2022-01-10 11:44:39 +08:00 |
jiaoyangna
|
eea23a9dda
|
不显示收益修改提交
|
2022-01-07 13:58:20 +08:00 |
wangzhenxing
|
e5c176cd9f
|
[飞升]============特效显示修改提交
|
2022-01-07 10:08:55 +08:00 |
ZhangBiao
|
11b9a285ba
|
【家园】upview提交
|
2022-01-06 16:41:17 +08:00 |
ZhangBiao
|
6b1c28a920
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralInfoPopup.prefab
# Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
# Assets/ManagedResources/~Lua/Common/Managers.lua
# Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
# Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua
# Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
# Assets/ManagedResources/~Lua/Modules/Net/IndicationManager.lua
# Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua
# Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua
# Assets/ManagedResources/~Lua/View/UpView.lua
|
2022-01-06 16:40:24 +08:00 |
jiaoyangna
|
b1be355601
|
Merge branch 'tansuo' into china/dev
# Conflicts:
# Assets/ManagedResources/Atlas/ExploreAtlas.meta
# Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
# Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2022-01-06 16:07:59 +08:00 |
ZhangBiao
|
9c874f1789
|
Merge branch 'china/dev' into 0功能/家园
# Conflicts:
# Assets/ManagedResources/Icon/Item/icon_laohu.png.meta
# Assets/ManagedResources/Icon/Item/r_Resource_laohu.png.meta
# Assets/ManagedResources/~Lua/Data/ConfigData.lua
# Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
# Assets/ManagedResources/~Lua/Modules/Popup/RoleInfoPopup.lua
|
2022-01-06 15:38:48 +08:00 |
ZhangBiao
|
499e1d2d49
|
【家园】界面微调
|
2022-01-06 10:56:59 +08:00 |
wangzhenxing
|
d2b10ebb38
|
[飞升]=============飞升特效修改提交
|
2022-01-05 18:25:59 +08:00 |
wangzhenxing
|
5b670023ed
|
[飞升]=======飞升代码逻辑提交
|
2022-01-05 18:17:44 +08:00 |