wangzhenxing
|
0ec0ccc6b2
|
玩家界面修改提交
|
2023-11-03 18:43:17 +08:00 |
wangzhenxing
|
dd9444c745
|
屏蔽英雄觉醒显示
|
2023-10-27 17:09:16 +08:00 |
wangzhenxing
|
1c65cd4052
|
法灵修改
|
2023-10-27 16:16:37 +08:00 |
wangzhenxing
|
e795b4834b
|
法灵红点提交
|
2023-10-27 14:10:43 +08:00 |
wangzhenxing
|
ed4865cc3c
|
法宝星级显示修改
|
2023-10-26 20:44:18 +08:00 |
wangzhenxing
|
0d08ea1a84
|
法灵提交
|
2023-10-26 17:16:10 +08:00 |
xiejun
|
663fbca133
|
神兵热榜
|
2023-10-24 20:02:38 +08:00 |
wangzhenxing
|
64d5426397
|
装备=============套装属性 技能显示修改
|
2023-10-17 15:47:10 +08:00 |
wangzhenxing
|
a66437ec72
|
潜能提交
|
2023-10-16 15:12:47 +08:00 |
wangzhenxing
|
de562386e0
|
Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab
|
2023-09-28 16:01:34 +08:00 |
wangzhenxing
|
1e1fd36489
|
玩家信息界面修改
|
2023-09-28 16:00:26 +08:00 |
wangzhenxing
|
bb18772265
|
Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
# Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
# Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua
|
2023-09-21 18:43:54 +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 |
wangzhenxing
|
600f270128
|
礼物添加总属性显示,逍遥游寻仙修改
|
2023-09-19 18:03:00 +08:00 |
wangzhenxing
|
e3a8cd725f
|
合并冲突提交
|
2023-09-15 14:24:03 +08:00 |
wangzhenxing
|
acdb5a21cd
|
礼物修改提交
|
2023-09-15 14:11:14 +08:00 |
wangzhenxing
|
049cebd574
|
灵兽星际显示修改提交
|
2023-09-15 13:56:38 +08:00 |
wangzhenxing
|
e80056fcd4
|
查看礼物信息提交
|
2023-09-13 15:44:06 +08:00 |
wangzhenxing
|
eeb3859f72
|
礼物功能提交
|
2023-09-13 14:57:48 +08:00 |
wangzhenxing
|
18e10b4fb6
|
命格修改提交
|
2023-08-31 19:12:02 +08:00 |
wangzhenxing
|
52393c592c
|
命石提交
|
2023-08-31 15:02:13 +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
|
a2ed294523
|
英雄信息界面变身卡星级显示修改
|
2023-08-16 11:36:58 +08:00 |
xiejun
|
148443883c
|
神将
|
2023-08-11 19:03:48 +08:00 |
wangzhenxing
|
59c75221b0
|
七界秘宝开启奖励显示修改
|
2023-08-07 15:47:14 +08:00 |
wangzhenxing
|
c32b71d3fc
|
变身卡无法升星修改,法宝超过10级显示修改
|
2023-08-02 14:46:18 +08:00 |
xiejun
|
fd8329bf90
|
海贼UI
|
2023-07-27 18:37:04 +08:00 |
PC-202302260912\Administrator
|
2987bc24a2
|
心魔试炼=================屏蔽神应显示
|
2023-07-14 11:24:26 +08:00 |
PC-202302260912\Administrator
|
de3f2d011a
|
心愿宝箱奖励排序修改
|
2023-07-10 18:56:20 +08:00 |
PC-202302260912\Administrator
|
8bae77bd5b
|
[法宝]====================法宝特性描述修改
|
2023-07-07 10:27:42 +08:00 |
PC-202302260912\Administrator
|
65f0eac110
|
法宝25级特性显示修改
|
2023-07-06 16:28:19 +08:00 |
PC-202302260912\Administrator
|
795c3e52f0
|
心願抽卡修改提交
|
2023-06-13 18:46:34 +08:00 |
wangzhenxing
|
d1c46a2b4e
|
心愿奖励预览提交
|
2023-06-07 11:36:53 +08:00 |
wangzhenxing
|
ebfddaad60
|
法宝心愿修改提交
|
2023-06-06 15:57:53 +08:00 |
yuanshuai
|
d4a971e087
|
Merge branch 'china/dev_bt_develop' into china/dev_bt
# Conflicts:
# Assets/ManagedResources/~Lua/Modules/Popup/HomeLandEquipPopup.lua
|
2023-05-08 17:42:35 +08:00 |
yuanshuai
|
b02ebc8b22
|
摘星阁bug修改
|
2023-05-08 17:27:12 +08:00 |
yuanshuai
|
9f4109c16f
|
七界试炼bug修复
|
2023-05-08 15:00:52 +08:00 |
wangzhenxing
|
35ee3bdf48
|
摘星阁修改
|
2023-04-23 15:23:41 +08:00 |
wangzhenxing
|
7758ec6d8d
|
法宝自选箱,宝物添加时空选项
|
2023-04-21 10:50:09 +08:00 |
wangzhenxing
|
5999c18900
|
新英雄上阵修改提交
|
2023-04-18 15:34:22 +08:00 |
wangzhenxing
|
3f8a00cb14
|
[神兵]==================修改提交
|
2023-04-11 14:41:36 +08:00 |
yuanshuai
|
a7ccff7ff1
|
神兵功能优化
|
2023-04-06 18:13:54 +08:00 |
wangzhenxing
|
12e2cecaa1
|
神兵属性,神兵羁绊,神兵分解提交
|
2023-04-04 11:15:32 +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
|
826f58ce6e
|
神兵提交
|
2023-03-28 13:57:59 +08:00 |
wangzhenxing
|
91b1bbb82c
|
遴选多队塔代码
|
2023-03-21 10:58:00 +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
|
6fe2c64214
|
获得宝箱修改提交
|
2023-02-22 10:45:17 +08:00 |
wangzhenxing
|
2985c1f5a2
|
法相装备修改提交
|
2023-02-21 14:20:46 +08:00 |
wangzhenxing
|
ff6f452f32
|
法相属性显示修改
|
2023-02-20 18:49:34 +08:00 |
wangzhenxing
|
0b88a77535
|
法相修改提交
|
2023-02-20 17:38:59 +08:00 |
yuanshuai
|
0d44032d25
|
灵脉修改
|
2023-02-20 15:06:47 +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 |
wangzhenxing
|
726b53355e
|
法相背包修改提交
|
2023-02-19 21:21:45 +08:00 |
wangzhenxing
|
d84f374bf2
|
法相修改提交
|
2023-02-19 20:08:48 +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 |
yuanshuai
|
98ddf9b5c2
|
法相相关脚本预设提交
|
2023-02-18 13:31:36 +08:00 |
wangzhenxing
|
0b6d8ab978
|
法相提交
|
2023-02-17 19:43:00 +08:00 |
yuanshuai
|
d13e485b05
|
神将置换功能提交
|
2023-02-16 18:11:55 +08:00 |
wangzhenxing
|
ba747f657a
|
神印升品空白修改
|
2023-01-24 20:29:23 +08:00 |
wangzhenxing
|
c9eb00de9e
|
精炼技能显示修改
|
2022-12-27 15:55:20 +08:00 |
wangzhenxing
|
c1e82cdeac
|
神将召唤自选箱修改
|
2022-12-27 14:32:01 +08:00 |
yuanshuai
|
d122e5f4cb
|
红包概率取整
|
2022-12-27 11:04:30 +08:00 |
wangzhenxing
|
db66b84788
|
Merge branch 'china/dev_bt' of http://60.1.1.230/gaoxin/JL_Client into china/dev_bt
|
2022-12-26 16:04:15 +08:00 |
wangzhenxing
|
45e3afaaaa
|
物品信息界面修改提交
|
2022-12-26 16:03:38 +08:00 |
yuanshuai
|
65f8e5e166
|
鸿蒙阵修改
|
2022-12-26 15:48:44 +08:00 |
yuanshuai
|
ec8fa4a8ca
|
欧皇红包概率显示修改
|
2022-12-26 14:03:59 +08:00 |
yuanshuai
|
729f426538
|
红包概率弹窗调整
|
2022-12-23 14:13:15 +08:00 |
wangzhenxing
|
18e879ef91
|
刷冲gm文字修改
|
2022-12-15 11:39:09 +08:00 |
wangzhenxing
|
7109e86706
|
英雄热榜提交
|
2022-12-13 16:06:12 +08:00 |
yuanshuai
|
106c095086
|
宝箱红包类型道具获取概率弹窗
|
2022-12-07 18:26:11 +08:00 |
wangzhenxing
|
d914ebd111
|
魂宝灵宝增加精炼技能,神印增加套装技能
|
2022-11-18 17:35:05 +08:00 |
yuanshuai
|
41d594edbc
|
挑战副本修改优化
|
2022-11-17 10:48:24 +08:00 |
yuanshuai
|
1545823af6
|
挑战副本修改提交
|
2022-11-16 14:01:40 +08:00 |
yuanshuai
|
5fc4f301c4
|
挑战副本修改
|
2022-11-14 11:19:18 +08:00 |
wangzhenxing
|
8c2401173f
|
装备评分显示修改
|
2022-11-11 16:38:39 +08:00 |
yuanshuai
|
8533fb9a4d
|
神应属性显示bug修改
|
2022-11-10 13:17:03 +08:00 |
wangzhenxing
|
b39188841a
|
每日累充修改 魂印描述修改
|
2022-11-09 17:55:54 +08:00 |
wangzhenxing
|
aea73aecec
|
【山河设计图】====购买玉衡龙魂丹消耗修改
|
2022-11-07 16:19:03 +08:00 |
wangzhenxing
|
8ecb6ee081
|
七界特权描述修改
|
2022-11-07 15:06:33 +08:00 |
wangzhenxing
|
07f7aa5f41
|
背包通用碎片显示修改
|
2022-11-04 15:11:02 +08:00 |
wangzhenxing
|
422efbe338
|
青龙秘宝价格修改
|
2022-11-04 14:43:35 +08:00 |
wangzhenxing
|
9163954640
|
背包添加变身卡描述
|
2022-11-02 18:14:24 +08:00 |
wangzhenxing
|
0543114a36
|
角色星级扩展
|
2022-11-02 16:26:40 +08:00 |
wangzhenxing
|
ddc23a9319
|
[gm]======背包使用添加类型
|
2022-11-01 10:09:17 +08:00 |
wangzhenxing
|
f3d4eed21c
|
[gm]=======名望特权修改
|
2022-10-25 10:23:48 +08:00 |
wangzhenxing
|
f1c0a2fcd8
|
[背包]====直冲卡添加使用
|
2022-09-23 15:50:28 +08:00 |
wangzhenxing
|
ce0ae1ce1a
|
[gm]======创角即送
|
2022-09-21 18:34:15 +08:00 |
wangzhenxing
|
a8f46604c9
|
[gm]======创角即送提交
|
2022-09-21 16:08:59 +08:00 |
wangzhenxing
|
fdaec2ac28
|
[gm修改器]=====提交
|
2022-09-20 17:04:48 +08:00 |
yuanshuai
|
180bc4593a
|
神应等级限制
|
2022-09-06 16:25:49 +08:00 |
yuanshuai
|
573ea577ce
|
建木神树修改提交
|
2022-09-06 10:16:57 +08:00 |
yuanshuai
|
0d5e75395f
|
摘星阁bug修改
|
2022-09-02 15:22:35 +08:00 |
yuanshuai
|
9197a89d5a
|
摘星阁bug修改
|
2022-09-02 14:40:36 +08:00 |
yuanshuai
|
a506dc7997
|
界面显示修改提交
|
2022-09-02 14:26:03 +08:00 |
yuanshuai
|
08cf1d1ea8
|
添加重置
|
2022-09-02 13:15:24 +08:00 |
yuanshuai
|
f83dce69b4
|
摘星阁bug修改
|
2022-09-01 18:34:32 +08:00 |
yuanshuai
|
5eb0d6fcba
|
摘星阁英雄列表排序
|
2022-09-01 17:52:21 +08:00 |
yuanshuai
|
96f8605bb1
|
摘星阁脚本预设提交
|
2022-09-01 17:30:15 +08:00 |
yuanshuai
|
e41c13e565
|
法宝显示修改
|
2022-08-30 18:12:25 +08:00 |
yuanshuai
|
a10a386b24
|
法宝修改提交
|
2022-08-30 15:55:37 +08:00 |
wangzhenxing
|
a32c76c9a0
|
[神罗环境]=======无法重复扫荡
|
2022-08-18 16:32:06 +08:00 |
wangzhenxing
|
ceefbf5c42
|
[背包]=====碎片合成按钮显示修改
|
2022-08-17 17:25:45 +08:00 |
wangzhenxing
|
06ba097de4
|
[背包]=========装备碎片提交
|
2022-08-11 11:19:05 +08:00 |
wangzhenxing
|
d38d35cadb
|
[法宝]=====归元提示修改
|
2022-08-10 16:44:44 +08:00 |
wangzhenxing
|
5120ccdf8c
|
[法宝背包显示修改]========
|
2022-08-10 13:46:01 +08:00 |
wangzhenxing
|
958c4286d1
|
[洞府摘星阁]=====显示修改
|
2022-08-09 13:42:59 +08:00 |
wangzhenxing
|
bd1ad039d9
|
[洞府摘星阁]======摘星阁消耗修改
|
2022-08-08 16:13:14 +08:00 |
yuanshuai
|
97678fc79c
|
身外化身修改提交
|
2022-07-20 14:26:09 +08:00 |
wangzhenxing
|
46f9a08c22
|
【抽卡】=======自选箱描述修改
|
2022-07-12 19:04:18 +08:00 |
yuanshuai
|
7f65810d70
|
宝箱添加点击详情
|
2022-07-06 11:40:35 +08:00 |
wangzhenxing
|
bb3f825aa9
|
【青龙秘宝】======奖励添加空判断
|
2022-07-04 18:43:22 +08:00 |
wangzhenxing
|
18660a1954
|
【青龙秘宝】=====添加空判断
|
2022-07-04 18:08:07 +08:00 |
wangzhenxing
|
cc883eadff
|
【青龙秘宝】========购买秘宝等级报错修改
|
2022-07-04 17:55:34 +08:00 |
wangzhenxing
|
7f8dcf2416
|
[连冲返利]=====报错修改,名称敏感字符提示修改
|
2022-06-21 14:40:48 +08:00 |
wangzhenxing
|
4c82f2d58c
|
【装备】======添加特效
|
2022-06-15 10:31:10 +08:00 |
wangzhenxing
|
1422c234d6
|
【装备合成】========装备神装页签添加红点
|
2022-06-14 18:50:04 +08:00 |
wangzhenxing
|
12e0c83271
|
【合成装备】=======套装属性显示修改
|
2022-06-14 17:59:20 +08:00 |
wangzhenxing
|
1cc17d4e4b
|
[装备合成]=======装备详情显示修改
|
2022-06-14 17:32:32 +08:00 |
wangzhenxing
|
5d41ecc114
|
【装备】======添加蓝白装备
|
2022-06-14 15:58:18 +08:00 |
wangzhenxing
|
c382f44681
|
[英雄技能]======飞升技能显示修改
|
2022-06-13 16:35:30 +08:00 |
wangzhenxing
|
d5be125722
|
【抽卡】=======抽卡宝箱描述修改
|
2022-06-08 18:14:25 +08:00 |
wangzhenxing
|
35fe308aaa
|
[抽卡]======仙缘箱开始展示修改
|
2022-06-08 17:15:25 +08:00 |
wangzhenxing
|
9eb6f8fb4e
|
[英雄信息]=====背景修改
|
2022-06-06 16:14:29 +08:00 |
wangzhenxing
|
6bc4adee78
|
[英雄信息界面]=====背景修改
|
2022-06-06 15:43:15 +08:00 |
wangzhenxing
|
a2cab243fc
|
【专属升星】======选择英雄界面报错修改
|
2022-05-26 11:14:13 +08:00 |
wangzhenxing
|
e509483e41
|
[寻仙招募]=====预设修改
|
2022-05-23 15:30:58 +08:00 |
wangzhenxing
|
e7df09c284
|
[寻仙招募]======修改提交
|
2022-05-23 11:29:10 +08:00 |
wangzhenxing
|
ad64dfd009
|
[引导]======神印引导修改提交
|
2022-05-20 11:16:54 +08:00 |
wangzhenxing
|
27ea9fd92c
|
查看他人英雄技能修改提交
|
2022-05-19 22:24:02 +08:00 |
wangzhenxing
|
d1970ed6cc
|
他人英雄详情修改
|
2022-05-19 22:12:14 +08:00 |
wangzhenxing
|
5e27a00173
|
英雄技能详情修改
|
2022-05-19 21:33:38 +08:00 |
wangzhenxing
|
6c902c649b
|
[首充]=====求掉显示10星属性按钮
|
2022-05-19 21:13:08 +08:00 |
wangzhenxing
|
d97c84a543
|
[英雄详情修改i]
|
2022-05-19 20:43:41 +08:00 |
wangzhenxing
|
3b4e771d16
|
[神将信息展示]======神将信息修改
|
2022-05-19 16:38:52 +08:00 |
wangzhenxing
|
d4a6bfdda2
|
【神将排版优化】========神将信息界面修改
|
2022-05-18 20:00:57 +08:00 |
wangzhenxing
|
685d475f2e
|
抽卡宝箱描述修改
|
2022-05-09 18:04:06 +08:00 |
wangzhenxing
|
97d96d07c0
|
仙缘汇聚箱描述修改
|
2022-05-09 14:02:31 +08:00 |
yuanshuai
|
44804a9a4d
|
漏提交
|
2022-04-26 18:52:19 +08:00 |
yuanshuai
|
311439c885
|
【天宫商店】去掉已获得变身卡的购买限制
|
2022-04-26 17:26:55 +08:00 |
yuanshuai
|
4199ea504a
|
查看其他玩家信息,变身卡信息不对bug
|
2022-04-26 17:20:19 +08:00 |
wangzhenxing
|
81122369c6
|
bug修改提交
|
2022-04-26 16:09:21 +08:00 |